backend/server/handlers/xmlrpc/registration.py | 6 +++--- backend/server/rhnServer/server_packages.py | 4 ++-- client/rhel/rhn-client-tools/src/up2date_client/capabilities.py | 2 +- client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 369f8294756c4d3bdc30987fdd78852554527560 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Oct 21 11:21:42 2009 +0200
fixing typos
this python, not perl
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index 11d2141..fee2d33 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -983,17 +983,17 @@ class Registration(rhnHandler): for package in packages: if package_is_dict: # extended_profile >= 2 - if type(package) != type({})): + if type(package) != type({}): log_error("Invalid package spec for extended_profile >= 2", type(package), "len = %d" % len(package)) raise rhnFault(21) - else + else: # extended_profile < 2 if (type(package) != type([]) or len(package) < 4): log_error("Invalid package spec", type(package), "len = %d" % len(package)) raise rhnFault(21) - else + else: p = {'name' : package[0], 'version': package[1], 'release': package[2], diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index cb4f65a..9dcffbb 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -34,9 +34,9 @@ def get_nvrea(entry): entry['epoch'] = "" nvrea = [] for k in ('name', 'version', 'release', 'epoch', 'arch'): - if entry[k] = None: + if entry[k] == None: return None - else + else: nvrea.append(str(entry[k])) return nvrea
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py index 905b878..9e00021 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py @@ -12,7 +12,7 @@ _ = gettext.gettext neededCaps = {"caneatCheese": {'version':"21"}, "supportsAutoUp2dateOption": {'version': "1"}, "registration.finish_message": {'version': "1"}, - "xmlrpc.packages.extended_profile": {'version':"1"}, + "xmlrpc.packages.extended_profile": {'version':"2"}, "registration.delta_packages": {'version':"1"}, "registration.remaining_subscriptions": {'version': '1'}, "registration.update_contact_info": {'version': "1"}, diff --git a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py index daccded..a4749a6 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py @@ -73,6 +73,6 @@ registerCap("packages.runTransaction", {'version':'1', 'value':'1'}) registerCap("packages.rollBack", {'version':'1', 'value':'1'}) registerCap("packages.verify", {'version':'1', 'value':'1'}) registerCap("packages.verifyAll", {'version':'1', 'value':'1'}) -registerCap("packages.extended_profile", {'version':'1', 'value':'1'}) +registerCap("packages.extended_profile", {'version':'2', 'value':'1'}) registerCap("reboot.reboot", {'version':'1', 'value':'1'}) registerCap("packages.update", {'version':'2', 'value':'2'})
spacewalk-commits@lists.fedorahosted.org