6 commits - proxy/proxy rel-eng/packages

Michael Mraka mmraka at fedoraproject.org
Thu Jun 14 08:59:20 UTC 2012


 proxy/proxy/pm/rhn_package_manager.py |   13 ++++++++-----
 proxy/proxy/pm/uploadLib.py           |   16 ----------------
 proxy/proxy/spacewalk-proxy.spec      |    9 ++++++++-
 rel-eng/packages/spacewalk-proxy      |    2 +-
 4 files changed, 17 insertions(+), 23 deletions(-)

New commits:
commit 59fe01805bdd7992036ecf45929f0f24f407c6f3
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Thu Jun 14 10:59:09 2012 +0200

    Automatic commit of package [spacewalk-proxy] release [1.8.5-1].

diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index e7b72fe..7b7cd74 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.4
+Version: 1.8.5
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: python
@@ -331,6 +331,13 @@ fi
 
 
 %changelog
+* 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
+- 829724 - session based authentication needs --new-cache and --no-cache
+- 829724 - use session based authentication
+- 829724 - /XP handler defines small subset of /APP handler functions
+
 * Mon Jun 11 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.4-1
 - provide /usr/share/spacewalk in proxy
 - %%defattr is not needed since rpm 4.4
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index bd74585..cfe768d 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.8.4-1 proxy/proxy/
+1.8.5-1 proxy/proxy/


commit a96b7e2e784bb7dcb5a7a95eebb43a0aeeee49d4
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 16:04:04 2012 +0200

    829724 - use session based calls from rhnpush.uploadLib

diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index b38a7a2..38b92df 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -24,10 +24,6 @@ class UploadClass(uploadLib.UploadClass):
     def _listChannelSource(self):
         self.die(1, "Listing source rpms not supported")
 
-    def _listChannel(self):
-        return uploadLib.listChannel(self.server, self.username, self.password,
-                                     self.channels)
-
     def copyonly(self):
         # Set the forcing factor
         self.setForce()
@@ -46,14 +42,6 @@ class UploadClass(uploadLib.UploadClass):
     def _get_files(self):
         return self.files
 
-    def _uploadSourcePackageInfo(self, info):
-        return uploadLib.call(self.server.packages.uploadSourcePackageInfo,
-                              self.username, self.password, info)
-
-    def _uploadPackageInfo(self, info):
-        return uploadLib.call(self.server.packages.uploadPackageInfo,
-                              self.username, self.password, info)
-
     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)


commit 1bd9af9891f3d2a3a7dc251789b3803beaf10ba5
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 15:53:09 2012 +0200

    829724 - modified checkSync() to use session based authentication

diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index cad5cb3..1e1a840 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -36,7 +36,7 @@ import os
 import sys
 import shutil
 from operator import truth
-from rhnpush.uploadLib import UploadError, listChannel
+from rhnpush.uploadLib import UploadError, listChannelBySession
 from optparse import Option, OptionParser
 
 # RHN imports
@@ -165,13 +165,14 @@ class UploadClass(uploadLib.UploadClass):
         self.setURL()
         # set the channels
         self.setChannels()
-        # set the username and password
-        self.setUsernamePassword()
         # set the server
         self.setServer()
 
+        self.authenticate()
+
         # List the channel's contents
-        channel_list = listChannel(self.server, self.username, self.password,
+        channel_list = listChannelBySession(self.server,
+                                     self.session.getSessionString(),
                                      self.channels)
 
         # Convert it to a hash of hashes


commit 9fbc16fae1647b4b25d702cb92cc4f34011a3dd5
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 15:43:19 2012 +0200

    829724 - session based authentication needs --new-cache and --no-cache

diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 0f97f3e..cad5cb3 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -71,6 +71,8 @@ def main():
         Option(     '--dontcopy',  action='store_true', help='Do not copy packages to the local directory'),
         Option(     '--copyonly',  action='store_true', help="Only copy packages; don't reimport"),
         Option(     '--test',      action='store_true', help='Only print the packages to be pushed'),
+        Option('-N','--new-cache',  action='store_true', help='Create a new username/password cache'),
+        Option(     '--no-cache',   action='store_true', help='Do not create a username/password cache'),
         Option(     '--no-ssl',    action='store_true', help='Turn off SSL (not recommended).'),
         Option(     '--no-session-caching',  action='store_true',
             help='Disables session-token authentication.'),


commit 271f618cb0a2ba32bbc2e8b299aa30fb6019486c
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 15:40:13 2012 +0200

    829724 - use session based authentication
    
    once we push packages via /APP we can reuse session based authentication
    from rhnpush

diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index 8cbd30d..b38a7a2 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -21,10 +21,6 @@ from rhnpush import uploadLib
 class UploadClass(uploadLib.UploadClass):
     """ Functionality for an uploading tool """
 
-    # pylint: disable=R0904
-    def authenticate(self):
-        self.setUsernamePassword()
-
     def _listChannelSource(self):
         self.die(1, "Listing source rpms not supported")
 


commit f75f2af00191f22109333dbd433ce1d6bc1c577b
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Mon Jun 11 15:20:57 2012 +0200

    829724 - /XP handler defines small subset of /APP handler functions
    
    so let's use /APP directly; moreover this is the only tool which uses /XP

diff --git a/proxy/proxy/pm/rhn_package_manager.py b/proxy/proxy/pm/rhn_package_manager.py
index 3247b19..0f97f3e 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -138,7 +138,7 @@ class UploadClass(uploadLib.UploadClass):
             scheme = 'https://'
         self.url = CFG.RHN_PARENT or ''
         self.url = parseUrl(self.url)[1].split(':')[0]
-        self.url = scheme + self.url + '/XP'
+        self.url = scheme + self.url + '/APP'
 
     def setProxyUsernamePassword(self):
         # overloaded for uploadlib.py




More information about the spacewalk-commits mailing list