backend/common/rhn_rpm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 0b95c82d4305a40b9661abd48a4a28b670326d66 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Apr 2 16:15:28 2009 -0400
check the attr instead of try catch
diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py index 3b622e6..3d0efcc 100644 --- a/backend/common/rhn_rpm.py +++ b/backend/common/rhn_rpm.py @@ -268,12 +268,12 @@ def get_package_header(filename=None, file=None, fd=None): if hdr is None: raise InvalidPackageError else: - try: + if hasattr(rpm, 'rpmHeaderFromFD'): 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) - except AttributeError: + else: # RHEL-4 and older, do the old way ts = RPMReadOnlyTransaction() nomd5 = getattr(rpm, 'RPMVSF_NOMD5')
spacewalk-commits@lists.fedorahosted.org