diff options
author | Tomás Touceda <chiiph@torproject.org> | 2011-09-01 23:50:54 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@torproject.org> | 2011-09-01 23:50:54 -0300 |
commit | f3602b42ad6db5918323c3b3be1c0d4c335e9c61 (patch) | |
tree | 3ce2aa1308c18b7f9efb0a8e08494a83f7105b68 /lib/thandy/packagesys/PackageSystem.py | |
parent | c288511871e2f90016ae7782d55451cbcffe5d5e (diff) |
Log with loggin instead of print, and add thp files to download when needed
Diffstat (limited to 'lib/thandy/packagesys/PackageSystem.py')
-rwxr-xr-x | lib/thandy/packagesys/PackageSystem.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/thandy/packagesys/PackageSystem.py b/lib/thandy/packagesys/PackageSystem.py index d1060d0..9fb878f 100755 --- a/lib/thandy/packagesys/PackageSystem.py +++ b/lib/thandy/packagesys/PackageSystem.py @@ -18,8 +18,11 @@ def getItemsFromPackage(pkg): extra = {} checker = getChecker(relPath, extra, defaultFormat=format, package=pkg) - installer = getInstaller(relPath, extra, - defaultFormat=format, package=pkg) + # we don't need this + # installer = getInstaller(relPath, extra, + # defaultFormat=format, package=pkg) + installer = None + result[relPath] = PackageItem(relPath, checker, installer) return result @@ -70,7 +73,6 @@ def getChecker(relPath, extra, defaultFormat, package): k,v=extra['registry_ent'] return thandy.packagesys.ExePackages.RegistryChecker(k,v) elif checkType == 'thp': - print "Getting thp checker" import thandy.packagesys.ThpPackages return thandy.packagesys.ThpPackages.ThpChecker( extra['thp_name'], extra['thp_version']) @@ -109,7 +111,6 @@ def getInstaller(relPath, extra, defaultFormat, package): installer = thandy.packagesys.ExePackages.CommandInstaller( relPath, extra['cmd_install'], extra.get('cmd_remove')) elif installType == 'thp': - print "Getting thp installer" import thandy.packagesys.ThpPackages installer = thandy.packagesys.ThpPackages.ThpInstaller( relPath) |