[yum-cvs] yum/yum depsolve.py,1.138,1.139

Seth Vidal skvidal at linux.duke.edu
Mon Mar 5 04:41:16 UTC 2007


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

Modified Files:
	depsolve.py 
Log Message:

make sure we look at the provides in the txmbr from packages which
aren't in any packagesack at all (localinstalls)


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- depsolve.py	1 Mar 2007 21:08:52 -0000	1.138
+++ depsolve.py	5 Mar 2007 04:41:14 -0000	1.139
@@ -1071,7 +1071,12 @@
             if self.tsInfo.getMembers(po.pkgtup):
                 self.deps[req] = po
                 return po
-
+        
+        for txmbr in self.tsInfo.getMembers(None, TS_INSTALL_STATES):
+            if txmbr.po.checkPrco('provides', (r, f, v)):
+                self.deps[req] = txmbr.po
+                return txmbr.po
+                
         return None # for new ts check attempt
 
     def _undoDepInstalls(self):




More information about the Yum-cvs-commits mailing list