[yum-cvs] yum/yum depsolve.py,1.120,1.121 packages.py,1.93,1.94

[James Bowes]

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

Modified Files:
	depsolve.py packages.py 
Log Message:
When loading the header for transaction checking, don't check the signature.

rpm will raise an exception when we try to read the header from an fdno, if
we have signature checking turned on and the header's signature is bad or
unknown. At the stage that we're reading the header, we don't care and just want
to get that data.


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- depsolve.py	16 Feb 2007 06:06:32 -0000	1.120
+++ depsolve.py	18 Feb 2007 14:30:57 -0000	1.121
@@ -150,7 +150,7 @@
                     continue
                 rpmfile = txmbr.po.localPkg()
                 if os.path.exists(rpmfile):
-                    hdr = txmbr.po.returnHeaderFromPackage(self.ts)
+                    hdr = txmbr.po.returnHeaderFromPackage()
                 else:
                     self.downloadHeader(txmbr.po)
                     hdr = txmbr.po.returnLocalHeader()

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- packages.py	16 Feb 2007 00:00:44 -0000	1.93
+++ packages.py	18 Feb 2007 14:30:57 -0000	1.94
@@ -481,9 +481,10 @@
             return int(fragid)
         return None
     
-    def returnHeaderFromPackage(self, read_ts):
+    def returnHeaderFromPackage(self):
         rpmfile = self.localPkg()
-        hdr = rpmUtils.miscutils.hdrFromPackage(read_ts, rpmfile)
+        ts = rpmUtils.transaction.initReadOnlyTransaction()
+        hdr = rpmUtils.miscutils.hdrFromPackage(ts, rpmfile)
         return hdr
         
     def returnLocalHeader(self):