diff options
Diffstat (limited to 'yum-presto/presto.py')
| -rw-r--r-- | yum-presto/presto.py | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/yum-presto/presto.py b/yum-presto/presto.py index a5bd77e..d693604 100644 --- a/yum-presto/presto.py +++ b/yum-presto/presto.py @@ -44,8 +44,6 @@ log = None # Configuration stuff def config_hook(conduit): - global log - # Set up repository specific deltarpm url and mirrorlist config.RepoConf.deltaurl = config.UrlListOption() config.RepoConf.deltamirrorlist = config.UrlOption() @@ -55,10 +53,7 @@ def config_hook(conduit): parser.add_option('', '--disablepresto', dest='disablepresto', action='store_true', default=False, help="disable Presto plugin and don't download any deltarpms") - - # Set up logging - log = prestoLog.PrestoLog(conduit, LOG_FILE) - + # Set up Presto repositories def postreposetup_hook(conduit): opts, commands = conduit.getCmdLine() @@ -100,23 +95,24 @@ def postresolve_hook(conduit): # In yum 3.0.x, this doesn't get defined if you run "yum update x" rather than "yum update" rpm_size += int(newpkg.po.size) drpm_size += int(chosen_drpm['size']) - newpkg.po.simple['realpackagesize'] = newpkg.po.size - newpkg.po.simple['packagesize'] = chosen_drpm['size'] - newpkg.po.simple['deltasize'] = chosen_drpm['size'] - newpkg.po.simple['deltarelativepath'] = chosen_drpm['drpm_filename'] - newpkg.po.simple['deltachecksumtype'] = chosen_drpm['checksum_type'] - newpkg.po.simple['deltachecksum'] = chosen_drpm['checksum'] - newpkg.po.simple['deltalocalpath'] = newpkg.po.repo.deltasdir + "/" + os.path.basename(chosen_drpm['drpm_filename']) + newpkg.po.realpackagesize = newpkg.po.size + if hasattr(newpkg.po, 'packagesize'): + newpkg.po.packagesize = chosen_drpm['size'] + else: + newpkg.po.simple['packagesize'] = chosen_drpm['size'] + newpkg.po.deltasize = chosen_drpm['size'] + newpkg.po.deltarelativepath = chosen_drpm['drpm_filename'] + newpkg.po.deltachecksumtype = chosen_drpm['checksum_type'] + newpkg.po.deltachecksum = chosen_drpm['checksum'] + newpkg.po.deltalocalpath = newpkg.po.repo.deltasdir + "/" + os.path.basename(chosen_drpm['drpm_filename']) newpkg.po.to = newpkg - newpkg.realpkgtup = newpkg.pkgtup - newpkg.pkgtup = (newpkg.name + " *", newpkg.arch, newpkg.epoch, newpkg.version, newpkg.release) newpkg.po.hasdrpm = True drpm_count += 1 else: if installed and drpm_enabled and not local: try: - rpm_size += int(newpkg.po.simple['packagesize']) - drpm_size += int(newpkg.po.simple['packagesize']) + rpm_size += int(newpkg.po.size) + drpm_size += int(newpkg.po.size) except: pass return @@ -126,6 +122,9 @@ def predownload_hook(conduit): global drpm_count global log + # Set up logging + log = prestoLog.PrestoLog(conduit, LOG_FILE) + pkglist = conduit.getDownloadPackages() opts, commands = conduit.getCmdLine() |