[yum-cvs] yum/yum __init__.py,1.247,1.248 packages.py,1.66,1.67

[Seth Vidal]

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

Modified Files:
	__init__.py packages.py 
Log Message:

get rid of silly code in verifyPkg()


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- __init__.py	8 Sep 2006 16:21:32 -0000	1.247
+++ __init__.py	8 Sep 2006 17:06:26 -0000	1.248
@@ -575,12 +575,7 @@
 
         if type(fo) is types.InstanceType:
             fo = fo.filename
-
-        for (csumtype, csum, csumid) in po.checksums:
-            if csumid:
-                checksum = csum
-                checksumType = csumtype
-                break
+        (csum_type, csum) = po.returnIdSum()
         try:
             self.verifyChecksum(fo, checksumType, checksum)
         except URLGrabError, e:

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- packages.py	8 Sep 2006 16:21:32 -0000	1.66
+++ packages.py	8 Sep 2006 17:06:26 -0000	1.67
@@ -166,6 +166,11 @@
 
     checksums = property(fget=lambda self: self.returnChecksums())
     
+    def returnIdSum(self):
+        for (csumtype, csum, csumid) in self.checksums:
+            if csumid:
+                return (csumtype, csum)
+                
 class RpmBase:
     """return functions and storage for rpm-specific data"""