backend/server/rhnServer/server_packages.py | 4 ++-- backend/server/rhnServer/server_wrapper.py | 2 +- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 9f45c24a07b54b47ff566172848595d9ee437bdc Author: Miroslav Suchý msuchy@redhat.com Date: Wed Oct 21 13:43:52 2009 +0200
fixing logical typos
diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 9dcffbb..44bf704 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -19,14 +19,14 @@ #
import string -from types import ListType, TupleType +from types import DictType, TupleType
from common import log_debug, rhn_rpm, rhnFault from server import rhnSQL, rhnLib from server_lib import snapshot_server, check_entitlement
def get_nvrea(entry): - if type(entry) not in (DictType): + if type(entry) != DictType: return None if entry['arch'] is None: entry['arch'] = "" diff --git a/backend/server/rhnServer/server_wrapper.py b/backend/server/rhnServer/server_wrapper.py index aaba1b2..950e169 100644 --- a/backend/server/rhnServer/server_wrapper.py +++ b/backend/server/rhnServer/server_wrapper.py @@ -56,7 +56,7 @@ class ServerWrapper(Packages, Hardware, History, SolarisPatches): # Wrappers for the similar functions from Packages class that supplementaly # require a valid sysid. def add_package(self, entry): - if entry[0].startswith("patch-solaris"): + if entry['name'].startswith("patch-solaris"): SolarisPatches.add_patch(self, self.server.get("id"), entry) return Packages.add_package(self, self.server.get("id"), entry)
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 5419bdc..6752735 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -144,8 +144,10 @@ def getInstalledPackageList(msgCallback = None, progressCallback = None, if package['arch']: pkg_list.append(package) elif getInfo: - package['arch'] = h['arch'] - package['cookie'] = h['cookie'] + if h['arch']: + package['arch'] = h['arch'] + if h['cookie']: + package['cookie'] = h['cookie'] pkg_list.append(package) else: pkg_list.append(package)
spacewalk-commits@lists.fedorahosted.org