client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 14 ++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
New commits: commit 8d94821bbf3caa1965b0cfc05ff5622c53d91896 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Oct 23 11:22:41 2009 +0200
530369 - header is inmutable
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index 2af913c..c4fc1a8 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -68,15 +68,17 @@ def verifyPackages(packages): missing_packages.append(package)
for header in headers: - if header['epoch'] == None: - header['epoch'] = "" + epoch = header['epoch'] + if epoch == None: + epoch = "" # gpg-pubkey "packages" can have an arch of None, see bz #162701 - if header["arch"] == None: - header["arch"] = "" + arch = header["arch"] + if arch == None: + arch = ""
pkg = (header['name'], header['version'], - header['release'], header['epoch'], - header["arch"]) + header['release'], epoch, + arch)
# dont include arch in the label if it's a None arch, #162701 if header["arch"] == "":
spacewalk-commits@lists.fedorahosted.org