3 commits - proxy/proxy rel-eng/packages
Michael Mraka
mmraka at fedoraproject.org
Thu Jun 14 09:45:09 UTC 2012
proxy/proxy/pm/Makefile | 2 -
proxy/proxy/pm/rhn_package_manager.py | 30 ++++++++++++++++++--
proxy/proxy/pm/uploadLib.py | 50 ----------------------------------
proxy/proxy/spacewalk-proxy.spec | 7 +++-
rel-eng/packages/spacewalk-proxy | 2 -
5 files changed, 34 insertions(+), 57 deletions(-)
New commits:
commit 10c001ecb0e821433f8f82cdd37b17fbc3db04ea
Author: Michael Mraka <michael.mraka at redhat.com>
Date: Thu Jun 14 11:44:59 2012 +0200
Automatic commit of package [spacewalk-proxy] release [1.8.6-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 118fc36..4f94399 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.8.5
+Version: 1.8.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,10 @@ fi
%changelog
+* Thu Jun 14 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.6-1
+- no more special uploadLib.py
+- merged uploadLib.UploadClass into rhn_package_manager.UploadClass
+
* Thu Jun 14 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.5-1
- 829724 - use session based calls from rhnpush.uploadLib
- 829724 - modified checkSync() to use session based authentication
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index cfe768d..73e6ddb 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.8.5-1 proxy/proxy/
+1.8.6-1 proxy/proxy/
commit a8348846877f53b3033b5b19dc215c94e1a54f0f
Author: Michael Mraka <michael.mraka at redhat.com>
Date: Mon Jun 11 16:53:36 2012 +0200
no more special uploadLib.py
diff --git a/proxy/proxy/pm/Makefile b/proxy/proxy/pm/Makefile
index d9b232f..8f80df3 100644
--- a/proxy/proxy/pm/Makefile
+++ b/proxy/proxy/pm/Makefile
@@ -4,7 +4,7 @@
TOP = ..
SUBDIR = PackageManager
-FILES = rhn_package_manager uploadLib __init__
+FILES = rhn_package_manager __init__
MAN_BASE = rhn_package_manager
MAN_SECT = 8
DOCBOOK2MAN = /usr/bin/docbook2man
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 7b7cd74..118fc36 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -317,7 +317,6 @@ fi
%attr(644,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_proxy_package_manager.conf
%{_bindir}/rhn_package_manager
%{rhnroot}/PackageManager/rhn_package_manager.py*
-%{rhnroot}/PackageManager/uploadLib.py*
%{rhnroot}/PackageManager/__init__.py*
%{_mandir}/man8/rhn_package_manager.8.gz
commit 38bd29e8e1e8042514805d2f93561c593e34b7c5
Author: Michael Mraka <michael.mraka at redhat.com>
Date: Mon Jun 11 16:38:25 2012 +0200
merged uploadLib.UploadClass into rhn_package_manager.UploadClass
removing unnecessary level of inheritance
diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 1e1a840..b394b1f 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -40,13 +40,12 @@ from rhnpush.uploadLib import UploadError, listChannelBySession
from optparse import Option, OptionParser
# RHN imports
+from rhnpush import uploadLib
+from spacewalk.common.checksum import getFileChecksum
from spacewalk.common.rhnConfig import CFG, initCFG
from spacewalk.common.rhnLib import parseUrl
initCFG('proxy.package_manager')
-# local imports
-import uploadLib
-
# globals
PREFIX = 'rhn'
@@ -224,6 +223,31 @@ class UploadClass(uploadLib.UploadClass):
# see the files
os.chmod(packagePath, 0644)
+ def _listChannelSource(self):
+ self.die(1, "Listing source rpms not supported")
+
+ def copyonly(self):
+ # Set the forcing factor
+ self.setForce()
+ # Relative directory
+ self.setRelativeDir()
+ # Set the count
+ self.setCount()
+
+ for filename in self.files:
+ fileinfo = self._processFile(filename,
+ relativeDir=self.relativeDir,
+ source=self.options.source,
+ nosig=self.options.nosig)
+ self.processPackage(fileinfo['nvrea'], filename)
+
+ def _processFile(self, 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)
+ checksum = getFileChecksum('md5', filename=filename)
+ info['md5sum'] = checksum
+ return info
+
def rpmPackageName(p):
return "%s-%s-%s.%s.rpm" % (p[0], p[1], p[2], p[4])
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
deleted file mode 100644
index 38b92df..0000000
--- a/proxy/proxy/pm/uploadLib.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Uploading function lib
-#
-# Copyright (c) 2008--2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-# RHN imports
-from spacewalk.common.checksum import getFileChecksum
-from rhnpush import uploadLib
-
-class UploadClass(uploadLib.UploadClass):
- """ Functionality for an uploading tool """
-
- def _listChannelSource(self):
- self.die(1, "Listing source rpms not supported")
-
- def copyonly(self):
- # Set the forcing factor
- self.setForce()
- # Relative directory
- self.setRelativeDir()
- # Set the count
- self.setCount()
-
- for filename in self.files:
- fileinfo = self._processFile(filename,
- relativeDir=self.relativeDir,
- source=self.options.source,
- nosig=self.options.nosig)
- self.processPackage(fileinfo['nvrea'], filename)
-
- def _get_files(self):
- return self.files
-
- def _processFile(self, 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)
- checksum = getFileChecksum('md5', filename=filename)
- info['md5sum'] = checksum
- return info
More information about the spacewalk-commits
mailing list