backend/server/rhnServer/server_packages.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit a1d9191a4589fc42dc435cd318397daa799022d4 Author: Michael Mraka michael.mraka@redhat.com Date: Wed Oct 21 14:08:15 2009 +0200
fix for nonexistent arch (e.g. for gpgkeys)
diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 9591689..c45ca1f 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -28,7 +28,7 @@ from server_lib import snapshot_server, check_entitlement def get_nvrea(entry): if type(entry) != DictType: return None - if entry['arch'] is None: + if not entry.has_key('arch') or entry['arch'] is None: entry['arch'] = "" if string.lower(str(entry['epoch'])) == "(none)" or entry['epoch'] == None: entry['epoch'] = ""
commit 0de5d7810deb1e6eab1948726fcb57c36bebdecd Author: Michael Mraka michael.mraka@redhat.com Date: Wed Oct 21 14:04:31 2009 +0200
fixed variable types
diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 44bf704..9591689 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -30,7 +30,7 @@ def get_nvrea(entry): return None if entry['arch'] is None: entry['arch'] = "" - if string.lower(entry['epoch']) == "(none)" or entry['epoch'] == None: + if string.lower(str(entry['epoch'])) == "(none)" or entry['epoch'] == None: entry['epoch'] = "" nvrea = [] for k in ('name', 'version', 'release', 'epoch', 'arch'): @@ -38,7 +38,7 @@ def get_nvrea(entry): return None else: nvrea.append(str(entry[k])) - return nvrea + return tuple(nvrea)
# A small class that helps us represent things about a # database package. In this structure "real" means that we have an
spacewalk-commits@lists.fedorahosted.org