proxy/proxy/pm/rhn_package_manager.py | 5 +++-- proxy/proxy/spacewalk-proxy.spec | 5 ++++- rel-eng/packages/spacewalk-proxy | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 645b525c768f558faab83fa938f2ca36ab077394 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Oct 23 13:39:36 2012 +0200
Automatic commit of package [spacewalk-proxy] release [1.8.13-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 9032dc8..85adc6d 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/%%7Bname%7D-%%7Bversion%7D.t... -Version: 1.8.12 +Version: 1.8.13 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -330,6 +330,9 @@ fi
%changelog +* Tue Oct 23 2012 Michael Mraka michael.mraka@redhat.com 1.8.13-1 +- _processFile() from uploadLib is static + * Mon Oct 22 2012 Jan Pazdziora 1.8.12-1 - bump up proxy version to 5.5.0
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index defe8eb..f4afe35 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -1.8.12-1 proxy/proxy/ +1.8.13-1 proxy/proxy/
commit 327154b8cf6beeb720a549322e052fbfdc497fef Author: Michael Mraka michael.mraka@redhat.com Date: Tue Oct 23 11:13:11 2012 +0200
_processFile() from uploadLib is static
W0221:243,4:UploadClass._processFile: Arguments number differs from overridden method E1121:245,15:UploadClass._processFile: Too many positional arguments for function call
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py index 86abeda..20f209c 100755 --- a/proxy/proxy/pm/rhn_package_manager.py +++ b/proxy/proxy/pm/rhn_package_manager.py @@ -240,9 +240,10 @@ class UploadClass(uploadLib.UploadClass): nosig=self.options.nosig) self.processPackage(fileinfo['nvrea'], filename)
- def _processFile(self, filename, relativeDir=None, source=None, nosig=None): + @staticmethod + def _processFile(filename, relativeDir=None, source=None, nosig=None): """ call parent _processFile and add to returned has md5sum """ - info = uploadLib.UploadClass._processFile(self, filename, relativeDir, source, nosig) + info = uploadLib.UploadClass._processFile(filename, relativeDir, source, nosig) checksum = getFileChecksum('md5', filename=filename) info['md5sum'] = checksum return info