5 commits - backend/server backend/spacewalk-backend.spec client/tools rel-eng/packages

Michael Mraka mmraka at fedoraproject.org
Tue Jun 26 09:48:09 UTC 2012


 backend/server/importlib/backend.py |   44 ------------------------------------
 backend/spacewalk-backend.spec      |    5 +++-
 client/tools/rhnpush/rhnpush.py     |   17 +++++--------
 client/tools/rhnpush/uploadLib.py   |   30 ++++--------------------
 rel-eng/packages/spacewalk-backend  |    2 -
 5 files changed, 17 insertions(+), 81 deletions(-)

New commits:
commit b1d3885cbac4269ef0cfec439fd9be51a9c75414
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 26 11:47:57 2012 +0200

    Automatic commit of package [spacewalk-backend] release [1.8.40-1].

diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 58c91dd..0e99669 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
-Version: 1.8.39
+Version: 1.8.40
 Release: 1%{?dist}
 URL:       https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
 
 # $Id$
 %changelog
+* Tue Jun 26 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.40-1
+- removed dead code backend.listChannel()
+
 * Fri Jun 22 2012 Jan Pazdziora 1.8.39-1
 - 712313 - Add installed size to repodata
 
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a59ca68..97d91c2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.39-1 backend/
+1.8.40-1 backend/


commit 33ecb8f973ccbb7db935e28d16a11ca69a811187
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 12 15:42:34 2012 +0200

    reuse UploadError from uploadLib

diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 599e200..5f94fe4 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -369,7 +369,7 @@ class UploadClass(uploadLib.UploadClass):
                 try:
                     ret = self.package(pkg, checksum_type, checksum)
                     if ret is None:
-                        raise UploadError()
+                        raise uploadLib.UploadError()
 
                 # TODO:  Revisit this.  We throw this error all over the place,
                 #        but doing so will cause us to skip the --tolerant logic
@@ -380,7 +380,7 @@ class UploadClass(uploadLib.UploadClass):
 
                 #FIX: it checks for tolerant flag and aborts only if the flag is
                 #not specified
-                except UploadError, ue:
+                except uploadLib.UploadError, ue:
                     if not self.options.tolerant:
                         self.die(1, ue)
                     self.warn(2, ue)
@@ -538,11 +538,11 @@ class UploadClass(uploadLib.UploadClass):
             
         if packaging == 'rpm' and self.options.nosig is None and not h.is_signed():
             #pkilambi:bug#173886:force exit to check for sig if --nosig 
-            raise UploadError("ERROR: %s: unsigned rpm (use --nosig to force)"% package)
+            raise uploadLib.UploadError("ERROR: %s: unsigned rpm (use --nosig to force)"% package)
 
         try:
             ret = self._push_package_v2(package, FileChecksumType, FileChecksum)
-        except UploadError, e:
+        except uploadLib.UploadError, e:
             ret, diff_level, pdict = e.args[:3]
             severities = {
                 1   : 'path changed',
@@ -564,7 +564,7 @@ class UploadClass(uploadLib.UploadClass):
             if diff_level != 1:
                 # This will prevent us from annoyingly retrying when there is
                 # no reason to.
-                raise UploadError()
+                raise uploadLib.UploadError()
             return ret
 
         return ret
@@ -594,13 +594,13 @@ class UploadClass(uploadLib.UploadClass):
                 data = rpclib.xmlrpclib.loads(msgstr)
             except:
 	        # Raise the exception instead of silently dying
-                raise UploadError("Error pushing %s: %s (%s)" % 
+                raise uploadLib.UploadError("Error pushing %s: %s (%s)" %
 		            (package, msgstr, status)), None, sys.exc_info()[2]
             (diff_dict, ), methodname = data
             del methodname
             diff_level = diff_dict['level']
             pdict = diff_dict['diff']
-            raise UploadError(ret, diff_level, pdict)
+            raise uploadLib.UploadError(ret, diff_level, pdict)
 
         if status == 403:
             #auth expired raise an exception to grab one
@@ -611,9 +611,6 @@ class UploadClass(uploadLib.UploadClass):
             
         return ret
 
-class UploadError(Exception):
-    pass
-
 class AuthenticationRequired(Exception):
     pass
 


commit 0f10d4045e87f568a36dc46ed23fc11e7d183dba
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 12 15:12:01 2012 +0200

    removed functions not used in rhnpush/rhn-package-manager

diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 6fd5b27..3c7bb32 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -603,21 +603,12 @@ def parseXMLRPCfault(fault):
         faultCode = -faultCode
     return ServerFault(faultCode, "", fault.faultString)
 
-def listChannel(server, username, password, channels):
-    return call(server.packages.listChannel, channels, username, password)
-
 def listChannelBySession(server, session_string, channels): 
     return call(server.packages.listChannelBySession, channels, session_string)
 
-def listChannelSource(server, username, password, channels):
-    return call(server.packages.listChannelSource, channels, username, password)
-
 def listChannelSourceBySession(server, session_string, channels):
     return call(server.packages.listChannelSourceBySession, channels, session_string)
 
-def listMissingSourcePackages(server, username, password, channels):
-    return call(server.packages.listMissingSourcePackages, channels, username, password)
-
 def listMissingSourcePackagesBySession(server, session_string, channels):
     return call(server.packages.listMissingSourcePackagesBySession, channels, session_string)
 
@@ -627,9 +618,6 @@ def getPackageChecksumBySession(server, session_string, info):
 def getSourcePackageChecksumBySession(server, session_string, info):
     return call(server.packages.getSourcePackageChecksumBySession, session_string, info)
 
-def getPackageChecksum(server, username, password, info):
-    return call(server.packages.getPackageChecksum, username, password, info)
-
 def getSourcePackageChecksum(server, username, password, info):
     return call(server.packages.getSourcePackageChecksum, username, password, info)
 
@@ -640,11 +628,6 @@ def getPackageMD5sumBySession(server, session_string, info):
 def getSourcePackageMD5sumBySession(server, session_string, info):
     return call(server.packages.getSourcePackageMD5sumBySession, session_string, info)
 
-def getPackageMD5sum(server, username, password, info):
-    return call(server.packages.getPackageMD5sum, username, password, info)
-
-def getSourcePackageMD5sum(server, username, password, info):
-    return call(server.packages.getSourcePackageMD5sum, username, password, info)
 
 
 def getServer(uri, proxy=None, username=None, password=None, ca_chain=None):


commit 51851fb8285e04bb6ae24d2d4c47aa4d6f0b0330
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 12 14:55:25 2012 +0200

    removed dead code backend.listChannel()
    
    this method seems to be unused since spacewalk 0.2

diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index e0b983f..9332926 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -1723,50 +1723,6 @@ class Backend:
             result[tname] = hash
         return result
 
-    def listChannel(self, channel):
-        fields = ['name', 'epoch', 'version', 'release', 'arch', 'org_id']
-        query = """
-            select
-                 pn.name, 
-                 (pe.evr).epoch epoch,
-                 (pe.evr).version as version,
-                 (pe.evr).release as release,
-                 pa.label as arch,
-                 p.org_id,
-                 cc.checksum_type,
-                 cc.checksum
-            from rhnChannel c, 
-                 rhnChannelPackage cp,
-                 rhnPackage p,
-                 rhnPackageName pn,
-                 rhnPackageEVR pe,
-                 rhnPackageArch pa,
-                 rhnChecksumView cc
-            where c.label = :label
-                 and p.package_arch_id = pa.id
-                 and cp.channel_id = c.id
-                 and cp.package_id = p.id
-                 and p.name_id = pn.id
-                 and p.evr_id = pe.id
-                 and p.checksum_id = cc.id
-        """
-        h = self.dbmodule.prepare(query)
-        h.execute(label=channel)
-        result = {}
-        while 1:
-            row = h.fetchone_dict()
-            if not row:
-                break
-            nevrao = []
-            for f in fields:
-                nevrao.append(row[f])
-            # Fix the epoch and org, just in case
-            for i in [1, 5]:
-                if nevrao[i] == '':
-                    nevrao[i] = None
-            result[tuple(nevrao)] = row
-        return result
-
     def __populateTable(self, table_name, data, delete_extra=1):
         table = self.tables[table_name]
         fields = table.getFields()


commit a53d6977824e63111f3a37a7593a4f2f77a18053
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 12 14:06:49 2012 +0200

    simplified authentication code

diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index abd4756..6fd5b27 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -432,14 +432,11 @@ class UploadClass:
         self.readSession()
         if self.session and not self.options.new_cache and self.options.username == self.username:
             chksession = self.checkSession(self.session.getSessionString())
-            if not chksession:
-                self.setUsernamePassword()
-                sessstr = call(self.server.packages.login, self.username, self.password)
-                self.writeSession(sessstr)
-        else:
-            self.setUsernamePassword()
-            sessstr = call(self.server.packages.login, self.username, self.password)
-            self.writeSession(sessstr)
+            if chksession:
+                return
+        self.setUsernamePassword()
+        sessstr = call(self.server.packages.login, self.username, self.password)
+        self.writeSession(sessstr)
 
     def _processFile(self, filename, relativeDir=None, source=None, nosig=None):
         """ Processes a file




More information about the spacewalk-commits mailing list