proxy/proxy/pm/rhn_package_manager.py | 22 +++++++++++-----------
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit e06ea938a46f337fcbea51524dcbcb455cf19aaa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 17 11:16:53 2012 +0100
Automatic commit of package [spacewalk-proxy] release [1.9.3-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 6e4d4ff..43d39e1 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.9.2
+Version: 1.9.3
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Mon Dec 17 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.3-1
+- fixed indentation
+
* Fri Dec 14 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.9.2-1
- 873541 - switch back to /XP handler if /APP is not available
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 099e876..991af35 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.9.2-1 proxy/proxy/
+1.9.3-1 proxy/proxy/
commit 1a5ee03faf1bb43630e102fd7c2456ce859fdbe6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 17 11:13:10 2012 +0100
fixed indentation
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index 12e8f8a..60db8f6 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -141,17 +141,17 @@ class UploadClass(uploadLib.UploadClass):
self.url = parseUrl(self.url)[1].split(':')[0]
self.url = scheme + self.url + path
- def setServer(self):
- try:
- uploadLib.UploadClass.setServer(self)
- uploadLib.call(self.server.packages.no_op, raise_protocol_error=True)
- except xmlrpclib.ProtocolError, e:
- if e.errcode == 404:
- self.use_session = False
- self.setURL('/XP')
- uploadLib.UploadClass.setServer(self)
- else:
- raise
+ def setServer(self):
+ try:
+ uploadLib.UploadClass.setServer(self)
+ uploadLib.call(self.server.packages.no_op, raise_protocol_error=True)
+ except xmlrpclib.ProtocolError, e:
+ if e.errcode == 404:
+ self.use_session = False
+ self.setURL('/XP')
+ uploadLib.UploadClass.setServer(self)
+ else:
+ raise
def authenticate(self):
if self.use_session: