rel-eng/packages/spacewalk-certs-tools | 2 +-
scripts/clone-errata/rhn-clone-errata.py | 4 ++--
scripts/clone-errata/spw-clone-errata.py | 6 +++---
spacewalk/certs-tools/rhn_bootstrap.py | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 6 +++++-
utils/migrateSystemProfile.py | 4 ++--
6 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit aed0c1c042c91055a19471f03eaa1d0ba91556a7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:44:46 2011 +0100
Automatic commit of package [spacewalk-certs-tools] release [1.3.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools
b/rel-eng/packages/spacewalk-certs-tools
index 8b28e0e..10882d2 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.3.1-1 spacewalk/certs-tools/
+1.3.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec
b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 7a1156f..f0cbfe7 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Tue Jan 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.2-1
+- fixed rpmlint errors
+- Updating the copyright years to include 2010.
+
* Wed Nov 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.1-1
- removed unused imports
commit 99bb50fbd2be5472b00920cff1658175d3362a69
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:42:10 2011 +0100
fixed E0602:185:lookup_server: Undefined variable 'org_id'
E0602:188:lookup_server: Undefined variable 'org_id'
diff --git a/utils/migrateSystemProfile.py b/utils/migrateSystemProfile.py
index 3ce49e8..a4cd98d 100644
--- a/utils/migrateSystemProfile.py
+++ b/utils/migrateSystemProfile.py
@@ -182,10 +182,10 @@ def lookup_server(key, from_org_id):
# TODO: replace with an api call
rows = client.org.listServerByOrg(key, from_org_id)
if not rows:
- sys.stderr.write("No Systems registered for Org-ID %s \n" % org_id)
+ sys.stderr.write("No Systems registered for Org-ID %s \n" %
from_org_id)
sys.exit(1)
print " "
- print "Available Systems for Org-ID: %s " % org_id
+ print "Available Systems for Org-ID: %s " % from_org_id
print "------------------------------------"
print " Server-ID Server-Name "
print "------------------------------------"
commit d0899cdf1779f9e7eba21989164c1dac0508b175
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:37:12 2011 +0100
fixed E1101:547:writeClientConfigOverrides: Module 'spacewalk.common.rhn_rpm'
has no 'RPMTAG_FILENAMES' member
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py
b/spacewalk/certs-tools/rhn_bootstrap.py
index 6e50a2c..938dabf 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -544,7 +544,7 @@ def writeClientConfigOverrides(options):
if _isRpmYN:
hdr = rhn_rpm.get_package_header(options.ssl_cert)
# Grab the first file out of the rpm
- d[up2dateConfMap['ssl_cert']] = hdr[rhn_rpm.RPMTAG_FILENAMES][0] # UGLY!
+ d[up2dateConfMap['ssl_cert']] = hdr[rhn_rpm.rpm.RPMTAG_FILENAMES][0] #
UGLY!
else:
d[up2dateConfMap['ssl_cert']] = os.path.join(_certdir, _certname)
d[up2dateConfMap['no_gpg']] = int(operator.truth(not options.no_gpg))
commit 257aff0c469deb81e0f227669fc13230df4b73cb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:31:05 2011 +0100
fixed E0602:272:RHNServer.findPackageChannels: Undefined variable 'retrun'
E1101:284:RHNServer.cloneErrata: Instance of 'RHNServer' has no 'self'
member
diff --git a/scripts/clone-errata/spw-clone-errata.py
b/scripts/clone-errata/spw-clone-errata.py
index d984fd5..71cbc7c 100644
--- a/scripts/clone-errata/spw-clone-errata.py
+++ b/scripts/clone-errata/spw-clone-errata.py
@@ -269,7 +269,7 @@ class RHNServer:
if retry > 3:
raise
else:
- return self.server.packages.findPackageChannels(pkgid, (retrun + 1))
+ return self.server.packages.findPackageChannels(pkgid, (retry + 1))
return channels
def cloneErrata(self,dest_chan,errata,retry):
@@ -281,7 +281,7 @@ class RHNServer:
print "Fault Code: %d\tFault String: %s" %
(f.faultCode,f.faultString)
if f.faultCode == -20:
self.rhnLogin(self.login,self.password)
- return self.self.server.errata.clone(self.rhnSession,dest_chan,errata)
+ return self.server.errata.clone(self.rhnSession,dest_chan,errata)
else:
raise
except xmlrpclib.ProtocolError, err:
commit a124dcc659d09f5f3a278452a5a258fe45dd04bd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:29:44 2011 +0100
fixed E1120: 91:RHNServer.getErrataChannels: No value passed for parameter
'retry' in function call
E1120:116:RHNServer.getErrataDetails: No value passed for parameter 'retry' in
function call
E1120:141:RHNServer.getErrataKeywords: No value passed for parameter 'retry'
in function call
E1120:166:RHNServer.getErrataBugs: No value passed for parameter 'retry' in
function call
E1120:191:RHNServer.getErrataCVEs: No value passed for parameter 'retry' in
function call
E1120:216:RHNServer.getErrataPackages: No value passed for parameter 'retry'
in function call
E1120:241:RHNServer.listChannelErrata: No value passed for parameter 'retry'
in function call
E1120:262:RHNServer.findPackageChannels: No value passed for parameter 'retry'
in function call
E1120:283:RHNServer.cloneErrata: No value passed for parameter 'retry' in
function call
E1120:305:SPWServer.searchNVREA: No value passed for parameter 'retry' in
function call
E1120:326:SPWServer.listChannelErrata: No value passed for parameter 'retry'
in function call
E1120:347:SPWServer.errataPublish: No value passed for parameter 'retry' in
function call
E1120:372:SPWServer.errataClone: No value passed for parameter 'retry' in
function call
E1120:397:SPWServer.errataCreate: No value passed for parameter 'retry' in
function call
diff --git a/scripts/clone-errata/spw-clone-errata.py
b/scripts/clone-errata/spw-clone-errata.py
index df649ad..d984fd5 100644
--- a/scripts/clone-errata/spw-clone-errata.py
+++ b/scripts/clone-errata/spw-clone-errata.py
@@ -60,7 +60,7 @@ class RHNServer:
self.server = xmlrpclib.Server(self.rhnUrl)
self.rhnSession = self.rhnLogin(self.login,self.password,0)
- def rhnLogin(self, login, password, retry):
+ def rhnLogin(self, login, password, retry=0):
try:
rhnSession=self.server.auth.login(login,password)
except xmlrpclib.Fault, f:
commit 6bbf88ebd459340a376fd3829620d87884edd569
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 10:27:23 2011 +0100
fixed E0602:280:RHNServer.findPackageChannels: Undefined variable 'retrun'
E1101:292:RHNServer.cloneErrata: Instance of 'RHNServer' has no 'self'
member
diff --git a/scripts/clone-errata/rhn-clone-errata.py
b/scripts/clone-errata/rhn-clone-errata.py
index dc88f98..bcd275e 100644
--- a/scripts/clone-errata/rhn-clone-errata.py
+++ b/scripts/clone-errata/rhn-clone-errata.py
@@ -277,7 +277,7 @@ class RHNServer:
if retry > 3:
raise
else:
- return self.server.packages.findPackageChannels(pkgid, (retrun + 1))
+ return self.server.packages.findPackageChannels(pkgid, (retry + 1))
return channels
def cloneErrata(self,dest_chan,errata,retry):
@@ -289,7 +289,7 @@ class RHNServer:
print "Fault Code: %d\tFault String: %s" %
(f.faultCode,f.faultString)
if f.faultCode == -20 or f.faultCode == -1:
self.rhnLogin(self.login,self.password,0)
- return self.self.server.errata.clone(self.rhnSession,dest_chan,errata)
+ return self.server.errata.clone(self.rhnSession,dest_chan,errata)
else:
raise
except xmlrpclib.ProtocolError, err: