[yum-cvs] yum/yum packages.py,1.105,1.106

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv861/yum

Modified Files:
	packages.py 
Log Message:
better fix for bad pkgid (rh#242604)


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- packages.py	26 Jun 2007 06:05:15 -0000	1.105
+++ packages.py	6 Jul 2007 19:33:53 -0000	1.106
@@ -671,8 +671,9 @@
         self.rel = self.release
         self.summary = self.hdr['summary']
         self.description = self.hdr['description']
-        self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER] or \
-                     self.hdr[rpm.RPMTAG_SIGMD5]
+        self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER]
+        if not self.pkgid:
+            self.pkgid = self.hdr[rpm.RPMTAG_SIGMD5]
         self.packagesize = self.hdr['size']
         self.__mode_cache = {}
         self.__prcoPopulated = False