diff options
author | Jonathan Dieter <jdieter@gmail.com> | 2007-03-24 21:50:35 +0200 |
---|---|---|
committer | Jonathan Dieter <jdieter@gmail.com> | 2007-03-24 21:50:35 +0200 |
commit | fff4696a43faa32f41d5c1726847b51c68db8d60 (patch) | |
tree | bd5cbaacfc5cde63a71fd3236d5fb0016a2234fe /presto.py | |
parent | 4abf9bc75423551b2fb0a9e8eee53868c4fb875a (diff) | |
download | presto-fff4696a43faa32f41d5c1726847b51c68db8d60.tar.gz presto-fff4696a43faa32f41d5c1726847b51c68db8d60.tar.xz presto-fff4696a43faa32f41d5c1726847b51c68db8d60.zip |
Fixed bug that breaks yum install
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
Diffstat (limited to 'presto.py')
-rw-r--r-- | presto.py | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -80,7 +80,7 @@ def postresolve_hook(conduit): # Cycle through packages to see if there's a deltarpm available for newpkg in conduit.getTsInfo(): if newpkg.ts_state != "e": - chosen_drpm = prestoTransaction.find_available_drpms(conduit, newpkg) + (chosen_drpm, installed, local) = prestoTransaction.find_available_drpms(conduit, newpkg) # If a drpm was found, change certain package information so it reflects # the drpm, not the rpm. @@ -109,10 +109,12 @@ def postresolve_hook(conduit): conduit.info(2, "Found deltarpm update for %s.%s %s:%s.%s" % (newpkg.name, newpkg.arch, newpkg.epoch, newpkg.version, newpkg.release)) else: newpkg.po.hasdrpm = False - if newpkg.po.repo.p_repo.enabled: - rpm_size += int(newpkg.po.simple['packagesize']) - drpm_size += int(newpkg.po.simple['packagesize']) - + if installed and not local and newpkg.po.repo.p_repo.enabled: + try: + rpm_size += int(newpkg.po.simple['packagesize']) + drpm_size += int(newpkg.po.simple['packagesize']) + except: + pass return # Free up memory used by deleting Presto repositories @@ -171,6 +173,6 @@ def posttrans_hook(conduit): global drpm_size if rpm_size > 0: - conduit.info(2, "Size of all files downloaded from Presto-enabled repositories: %i bytes" % drpm_size) - conduit.info(2, "Size that would have been downloaded if Presto wasn't enabled: %i bytes" % rpm_size) + conduit.info(2, "Size of all updates downloaded from Presto-enabled repositories: %i bytes" % drpm_size) + conduit.info(2, "Size updates would have been downloaded if Presto wasn't enabled: %i bytes" % rpm_size) conduit.info(2, "This is a savings of %i percent" % (100 - ((drpm_size * 100) / rpm_size))) |