[yum-cvs] yum/yum packages.py,1.95,1.96

[Jeremy Katz]

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

Modified Files:
	packages.py 
Log Message:
* simplify checkPrco slightly
* don't break API gratuitously with po.returnHeaderFromPackage()


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- packages.py	19 Feb 2007 00:49:36 -0000	1.95
+++ packages.py	19 Feb 2007 16:48:16 -0000	1.96
@@ -239,10 +239,7 @@
             # make us look it up and compare
             (reqn, reqf, (reqe, reqv ,reqr)) = prcotuple
             if reqf is not None:
-                if self.inPrcoRange(prcotype, prcotuple):
-                    return 1
-                else:
-                    return 0
+                return self.inPrcoRange(prcotype, prcotuple)
             else:
                 for (n, f, (e, v, r)) in self.returnPrco(prcotype):
                     if reqn == n:
@@ -481,9 +478,10 @@
             return int(fragid)
         return None
     
-    def returnHeaderFromPackage(self):
+    def returnHeaderFromPackage(self, ts = None):
         rpmfile = self.localPkg()
-        ts = rpmUtils.transaction.initReadOnlyTransaction()
+        if ts is None:
+            ts = rpmUtils.transaction.initReadOnlyTransaction()
         hdr = rpmUtils.miscutils.hdrFromPackage(ts, rpmfile)
         return hdr