proxy/proxy/pm/rhn_package_manager.py | 3 ++-
proxy/proxy/pm/uploadLib.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 3c70a2785f348a88f129ad1b394562cd2976889f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 26 15:56:16 2010 +0100
fix reference to _processBatch
addressing:
Traceback (most recent call last):
File "/usr/bin/rhn_package_manager", line 28, in ?
rhn_package_manager.main()
File "/usr/share/rhn/PackageManager/rhn_package_manager.py", line 126, in
main
upload.uploadHeaders()
File "/usr/share/rhn/PackageManager/uploadLib.py", line 114, in
uploadHeaders
uploadedPackages, headersList = _processBatch(chunk,
NameError: global name "_processBatch" is not defined
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index 47e14b6..d48260e 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -111,7 +111,7 @@ class UploadClass(uploadLib.UploadClass):
while self.files:
chunk = self.files[:self.count]
del self.files[:self.count]
- uploadedPackages, headersList = _processBatch(chunk,
+ uploadedPackages, headersList = uploadLib._processBatch(chunk,
relativeDir=self.relativeDir, source=self.options.source,
verbose=self.options.verbose, nosig=self.options.nosig)
commit 1bd1f07021405b36bd25909da9dc6b744a8300b2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 26 15:08:09 2010 +0100
fix reference to UploadError
addressing:
Traceback (most recent call last):
File "/usr/bin/rhn_package_manager", line 28, in ?
rhn_package_manager.main()
File "/usr/share/rhn/PackageManager/rhn_package_manager.py", line 126, in
main
except uploadLib.UploadError, e:
AttributeError: "module" object has no attribute "UploadError"
diff --git a/proxy/proxy/pm/rhn_package_manager.py
b/proxy/proxy/pm/rhn_package_manager.py
index daa6c3c..129bdaa 100755
--- a/proxy/proxy/pm/rhn_package_manager.py
+++ b/proxy/proxy/pm/rhn_package_manager.py
@@ -38,6 +38,7 @@ import string
import shutil
from types import IntType, StringType
from operator import truth
+from rhnpush.uploadLib import UploadError
try:
from optparse import Option, OptionParser
except ImportError:
@@ -123,7 +124,7 @@ def main():
try:
upload.uploadHeaders()
- except uploadLib.UploadError, e:
+ except UploadError, e:
sys.stderr.write("Upload error: %s\n" % e)
commit 060e5ad929f3967fc727aeecada9f0a26bfe6cb1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 26 15:04:09 2010 +0100
remove python-optik
python-optik is part of python since rhel4, we do not care about el3 any more
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 6dab8c1..f7d3ab3 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -128,9 +128,10 @@ Summary: Custom Channel Package Manager for the Spacewalk Proxy
Server
Group: Applications/Internet
Requires: spacewalk-backend
Requires: rhnlib
-Requires: python-optik
+Requires: python
Requires: rhnpush
BuildRequires: /usr/bin/docbook2man
+BuildRequires: python-devel
Obsoletes: rhn_package_manager < 5.3.0
Obsoletes: rhns-proxy-package-manager < 5.3.0
commit 27665d26338914820ad4f82357f775385cc04f57
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 26 14:49:34 2010 +0100
fixing wrong import
addressing:
Traceback (most recent call last):
File "<stdin>", line 1, in ?
File "/usr/share/rhn/PackageManager/rhn_package_manager.py", line 52, in
?
import uploadLib
File "/usr/share/rhn/PackageManager/uploadLib.py", line 25, in ?
from rhnpush import rhn_mpm
ImportError: cannot import name rhn_mpm
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index 936aa18..47e14b6 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -22,7 +22,7 @@ import fnmatch
import getpass
# RHN imports
-from rhnpush import rhn_mpm
+from spacewalk.common import rhn_mpm
from rhnpush import uploadLib
class UploadClass(uploadLib.UploadClass):