[yum-cvs] yum/yum depsolve.py,1.151,1.152

[James Bowes]

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

Modified Files:
	depsolve.py 
Log Message:
Simplify provideToPkg code


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- depsolve.py	1 Apr 2007 14:04:29 -0000	1.151
+++ depsolve.py	1 Apr 2007 14:56:55 -0000	1.152
@@ -807,16 +807,11 @@
         for pkgtup in self.rpmdb.whatProvides(r, f, v):
             # check the rpmdb first for something providing it that's not
             # set to be removed
-            txmbrs = self.tsInfo.getMembers(pkgtup)
+            txmbrs = self.tsInfo.getMembers(pkgtup, TS_REMOVE_STATES)
             if not txmbrs:
                 po = self.getInstalledPackageObject(pkgtup)            
                 self.deps[req] = po                
                 return po
-            for txmbr in txmbrs:
-                if txmbr.output_state not in TS_REMOVE_STATES:
-                    po = self.getInstalledPackageObject(pkgtup)
-                    self.deps[req] = po                
-                    return po
 
         for po in self.whatProvides(r, f, v):
             # if we already have something to be installed which