backend/server/handlers/xmlrpc/registration.py | 20 +++++++++-----------
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit f0750ec1f047f17dce7bd9fd3c3cdc8762c14e58
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 15 14:50:30 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.6.40-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index f8308b5..c3c6d89 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.39
+Version: 1.6.40
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Nov 15 2011 Miroslav Suchý 1.6.40-1
+- move common code to common function
+
* Tue Nov 15 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.39-1
- 738999 - aliases in update don't work
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 0bf3b48..cbb6179 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.39-1 backend/
+1.6.40-1 backend/
commit e30f326c7bc97aa52de16ac19da4065d1636a6d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 15 14:48:46 2011 +0100
move common code to common function __add_hw_profile_no_auth()
diff --git a/backend/server/handlers/xmlrpc/registration.py
b/backend/server/handlers/xmlrpc/registration.py
index a593ed2..1eefafc 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -972,31 +972,29 @@ class Registration(rhnHandler):
packagesV2.append(p)
return packagesV2
- def add_hw_profile(self, system_id, hwlist):
- """ Insert a new profile for the server """
- log_debug(5, system_id, hwlist)
- server = self.auth_system(system_id)
- # log the entry
+ def __add_hw_profile_no_auth(self, server, hwlist):
+ """ Insert a new profile for the server, but do not authenticate
"""
log_debug(1, server.getid(), "items: %d" % len(hwlist))
for hardware in hwlist:
server.add_hardware(hardware)
# XXX: check return code
server.save_hardware()
+
+ def add_hw_profile(self, system_id, hwlist):
+ """ Insert a new profile for the server """
+ log_debug(5, system_id, hwlist)
+ server = self.auth_system(system_id)
+ self.__add_hw_profile_no_auth(server, hwlist)
return 0
def refresh_hw_profile(self, system_id, hwlist):
""" Recreate the server HW profile """
log_debug(5, system_id, hwlist)
server = self.auth_system(system_id)
- # log the entry
- log_debug(1, server.getid(), "items: %d" % len(hwlist))
# clear out the existing list first
# the only difference between add_hw_profile and refresh_hw_profile
server.delete_hardware()
- for hardware in hwlist:
- server.add_hardware(hardware)
- # XXX: check return code
- server.save_hardware()
+ self.__add_hw_profile_no_auth(server, hwlist)
return 0
def welcome_message(self, lang = None):