proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
proxy/proxy/pm/rhn_package_manager.py | 4 ++--
proxy/proxy/pm/uploadLib.py | 4 ++--
rel-eng/packages/spacewalk-proxy-installer | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 2d3c0be4f1764ed754a1937f8a0fe0656679f8d7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:14:42 2011 +0100
Automatic commit of package [spacewalk-proxy-installer] release [1.3.4-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec
b/proxy/installer/spacewalk-proxy-installer.spec
index bd8b6cf..09c7df6 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.3.3
+Version: 1.3.4
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Tue Jan 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.4-1
+- fixed pylint errors
+- Updating the copyright years to include 2010.
+
* Wed Dec 08 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.3-1
- 660344 - do not use spacwalk-setup-jabberd in RHN Proxy 5.3 and older
diff --git a/rel-eng/packages/spacewalk-proxy-installer
b/rel-eng/packages/spacewalk-proxy-installer
index 36e6430..8591196 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.3.3-1 proxy/installer/
+1.3.4-1 proxy/installer/
commit c4cdd270c559ae9af9eaab49570810574f86e06d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:10:49 2011 +0100
fixed E1101:173:UploadClass.checkSync: Module 'uploadLib' has no
'listChannel' member
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index 58d36a2..2033bea 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -37,7 +37,7 @@ import sys
import string
import shutil
from operator import truth
-from rhnpush.uploadLib import UploadError
+from rhnpush.uploadLib import UploadError, listChannel
try:
from optparse import Option, OptionParser
except ImportError:
@@ -170,7 +170,7 @@ class UploadClass(uploadLib.UploadClass):
self.setServer()
# List the channel's contents
- list = uploadLib.listChannel(self.server, self.username, self.password,
+ list = listChannel(self.server, self.username, self.password,
self.channels)
# Convert it to a hash of hashes
commit 8c24660fc586c3fc8734e39584185091f5c7c65a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:08:31 2011 +0100
fixed E0602:178:get_header: Undefined variable 'UploadError'
E0602:183:get_header: Undefined variable 'UploadError'
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index 983e878..61ae98a 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -175,10 +175,10 @@ def get_header(file, fildes=None, source=None):
try:
h = rhn_mpm.get_package_header(filename=file, fd=fildes)
except rhn_mpm.InvalidPackageError:
- raise UploadError("Package is invalid")
+ raise uploadLib.UploadError("Package is invalid")
# Verify that this is indeed a binary/source. xor magic
# xor doesn't work with None values, so compare the negated values - the
# results are identical
if (not source) ^ (not h.is_source):
- raise UploadError("Unexpected RPM package type")
+ raise uploadLib.UploadError("Unexpected RPM package type")
return h