backend/spacewalk-backend.spec | 6 +-
backend/spacewalk/common/rhn_rpm.py | 98 +++++++++---------------------------
rel-eng/packages/spacewalk-backend | 2
3 files changed, 33 insertions(+), 73 deletions(-)
New commits:
commit 1540ce542c88df92fb4c575cb97ac04d5667eab8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 17:38:10 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.33-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 614dde3..37b09be 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.32
+Version: 0.8.33
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -609,6 +609,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Jan 20 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.33-1
+- fixed payload_size always = 0 error
+- removed dead code in rhn_rpm.py
+
* Tue Jan 19 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.32-1
- 556460 - time values are <long> on Fedora 12
- fixed DeprecationWarnings on Fedora 12
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 58d24bd..20c7c28 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.32-1 backend/
+0.8.33-1 backend/
commit a6f4a83c53c1bb5431df14dc21e17f9cb4cfcacf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 17:28:19 2010 +0100
fixed payload_size always = 0 error
it reverted code which fixed bz 487621, read the comment in case of
regression
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 72ef2dc..2c6cbe4 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -257,11 +257,19 @@ def get_package_header(filename=None, file=None, fd=None):
else:
file_desc = f.fileno()
- if hasattr(rpm, 'readHeaderFromFD'):
- header_start, header_end = \
- get_header_byte_range(os.fdopen(os.dup(file_desc)))
- os.lseek(file_desc, header_start, 0)
- hdr, offset = rpm.readHeaderFromFD(file_desc)
+# FIXME:
+ if None:
+ pass
+# - readHeaderFromFD() doesn't set hdr['archivesize'] which makes
payload_size = 0
+# for all imported packages
+# - this code was introduced as a fix of bz 487621; if it re-appears then uncomment
+# and try to fix missing hdr['archivesize'] another way
+# #if hasattr(rpm, 'readHeaderFromFD'):
+#
+# header_start, header_end = \
+# get_header_byte_range(os.fdopen(os.dup(file_desc)))
+# os.lseek(file_desc, header_start, 0)
+# hdr, offset = rpm.readHeaderFromFD(file_desc)
else:
# RHEL-4 and older, do the old way
ts = RPMReadOnlyTransaction()
commit 126984919993cfd02128fae2d7fee7af22728865
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 14:02:50 2010 +0100
replaced evil use of getattr
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 5af1725..72ef2dc 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -265,14 +265,12 @@ def get_package_header(filename=None, file=None, fd=None):
else:
# RHEL-4 and older, do the old way
ts = RPMReadOnlyTransaction()
- nomd5 = getattr(rpm, 'RPMVSF_NOMD5')
- needpayload = getattr(rpm, 'RPMVSF_NEEDPAYLOAD')
- ts.pushVSFlags(~(nomd5 | needpayload))
+ ts.pushVSFlags(~(rpm.RPMVSF_NOMD5 | rpm.RPMVSF_NEEDPAYLOAD))
hdr = RPMReadOnlyTransaction().hdrFromFdno(file_desc)
ts.popVSFlags()
if hdr is None:
raise InvalidPackageError
- is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
+ is_source = hdr[rpm.RPMTAG_SOURCEPACKAGE]
return RPM_Header(hdr, is_source)
@@ -303,13 +301,13 @@ class MatchIterator:
if hdr is None:
return None
- is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
+ is_source = hdr[rpm.RPMTAG_SOURCEPACKAGE]
return RPM_Header(hdr, is_source)
def headerLoad(data):
hdr = rpm.headerLoad(data)
- is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
+ is_source = hdr[rpm.RPMTAG_SOURCEPACKAGE]
return RPM_Header(hdr, is_source)
def labelCompare(t1, t2):
commit 588f6850ea4162f2b9ec13f3c33208e2110be5b1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 10:14:00 2010 +0100
made code more readable
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 8efc2d1..5af1725 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -78,30 +78,25 @@ class RPMTransaction:
# easier
def pushVSFlags(self, flags):
self.tsflags.append(flags)
- f = getattr(self.ts, 'setVSFlags')
- f(self.tsflags[-1])
+ self.ts.setVSFlags(self.tsflags[-1])
def popVSFlags(self):
del self.tsflags[-1]
- f = getattr(self.ts, 'setVSFlags')
- f(self.tsflags[-1])
+ self.ts.setVSFlags(self.tsflags[-1])
def addInstall(self, arg1, arg2, mode):
"""Install a package"""
hdr = arg1.hdr
- f = getattr(self.ts, 'addInstall')
- return f(hdr, arg2, mode)
+ return self.ts.addInstall(hdr, arg2, mode)
def addErase(self, arg1):
"""Erase a package"""
hdr = arg1.hdr
- f = getattr(self.ts, 'addErase')
- return f(hdr)
+ return self.ts.addErase(hdr)
def check(self):
"""Check dependencies"""
- f = getattr(self.ts, 'check')
- return f()
+ return self.ts.check()
def setFlags(self, flag):
"""Set transaction flags"""
commit 9f689f920e4244d59b4ce6ec1bcc8099e92b98d1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 10:09:25 2010 +0100
removed always true conditions
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 5275b69..8efc2d1 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -78,38 +78,29 @@ class RPMTransaction:
# easier
def pushVSFlags(self, flags):
self.tsflags.append(flags)
- if hasattr(self.ts, 'setVSFlags'):
- f = getattr(self.ts, 'setVSFlags')
- f(self.tsflags[-1])
+ f = getattr(self.ts, 'setVSFlags')
+ f(self.tsflags[-1])
def popVSFlags(self):
del self.tsflags[-1]
- if hasattr(self.ts, 'setVSFlags'):
- f = getattr(self.ts, 'setVSFlags')
- f(self.tsflags[-1])
+ f = getattr(self.ts, 'setVSFlags')
+ f(self.tsflags[-1])
def addInstall(self, arg1, arg2, mode):
"""Install a package"""
hdr = arg1.hdr
- if hasattr(self.ts, 'addInstall'):
- f = getattr(self.ts, 'addInstall')
- return f(hdr, arg2, mode)
- return self.ts.add(hdr, arg2, mode)
+ f = getattr(self.ts, 'addInstall')
+ return f(hdr, arg2, mode)
def addErase(self, arg1):
"""Erase a package"""
hdr = arg1.hdr
- if hasattr(self.ts, 'addErase'):
- f = getattr(self.ts, 'addErase')
- return f(hdr)
- return self.ts.add(hdr, hdr, "e")
+ f = getattr(self.ts, 'addErase')
+ return f(hdr)
def check(self):
"""Check dependencies"""
- if hasattr(self.ts, 'check'):
- f = getattr(self.ts, 'check')
- else:
- f = getattr(self.ts, 'depcheck')
+ f = getattr(self.ts, 'check')
return f()
def setFlags(self, flag):
commit 26b3ade9ce5f7d813d7efa94892bce6ff6dfe407
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 10:00:09 2010 +0100
removed dead code; oldest supported is RHEL4 / rpm-pyhton 4.3.3
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 82e624f..5275b69 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -62,15 +62,8 @@ class InvalidPackageError(Exception):
class RPMTransaction:
read_only = 0
def __init__(self):
- if hasattr(rpm, 'opendb'):
- db = getattr(rpm, 'opendb')(not self.read_only)
- self.ts = rpm.TransactionSet('/', db)
- else:
- self.ts = rpm.TransactionSet()
+ self.ts = rpm.TransactionSet()
self.tsflags = []
- # For rpm 4.0.4
- self._flags = 0
- self._prob_filter = 0
def __getattr__(self, attr):
return getattr(self.ts, attr)
@@ -121,27 +114,13 @@ class RPMTransaction:
def setFlags(self, flag):
"""Set transaction flags"""
- if hasattr(rpm, 'headerFromPackage'):
- # Old style rpm
- old_flags = self._flags
- self._flags = flag
- return old_flags
return self.ts.setFlags(flag)
def setProbFilter(self, flag):
"""Set problem flags"""
- if hasattr(rpm, 'headerFromPackage'):
- # Old style rpm
- old_flags = self._prob_filter
- self._prob_filter = flag
- return old_flags
return self.ts.setProbFilter(flag)
def run(self, callback, user_data):
- if hasattr(rpm, 'headerFromPackage'):
- # Old style rpm
- return self.ts.run(self._flags, self._prob_filter, callback,
- user_data)
return self.ts.run(callback, user_data)
@@ -317,15 +296,10 @@ class MatchIterator:
if not tag_name:
tag_name = "name"
- if hasattr(rpm, "headerFromPackage"):
- # rpm 4.0.4 or earlier
- self.db = rpm.opendb()
- method = self.db.match
- else:
- # rpm 4.1 or later
- self.ts = rpm.TransactionSet()
- self.ts.setVSFlags(8)
- method = self.ts.dbMatch
+ # rpm 4.1 or later
+ self.ts = rpm.TransactionSet()
+ self.ts.setVSFlags(8)
+ method = self.ts.dbMatch
if value:
self.mi = method(tag_name, value)
@@ -343,19 +317,13 @@ class MatchIterator:
if hdr is None:
return None
- if hasattr(rpm, "headerFromPackage"):
- is_source = not hdr[rpm.RPMTAG_SOURCERPM]
- else:
- is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
+ is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
return RPM_Header(hdr, is_source)
def headerLoad(data):
hdr = rpm.headerLoad(data)
- if hasattr(rpm, "headerFromPackage"):
- is_source = not hdr[rpm.RPMTAG_SOURCERPM]
- else:
- is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
+ is_source = hdr[getattr(rpm, 'RPMTAG_SOURCEPACKAGE')]
return RPM_Header(hdr, is_source)
def labelCompare(t1, t2):
commit b0fd5532a2bff4e6270a70f720cfc4759aba77db
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 20 09:49:02 2010 +0100
removed dead code; oldest supported is RHEL4 / Python 2.3.4
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 06a5995..82e624f 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -19,10 +19,6 @@ import rpm
import struct
import exceptions
-if not hasattr(exceptions, 'StopIteration'):
- # Presumably python 1.5.2
- class StopIteration(Exception):
- pass
# Expose a bunch of useful constants from rpm
error = rpm.error