[yum-cvs] yum/yum depsolve.py,1.153,1.154

[James Bowes]

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

Modified Files:
	depsolve.py 
Log Message:
Remove _checkUpdate

If a transaction member was marked as 'update', we'd run _checkInstall on it,
then run _checkRemove on all of the packages that it was updating. After this,
we'd then run _checkRemove on all transaction members marked as 'updated'. So
we were running _checkRemove on every 'updated' package twice. Get rid of this.


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- depsolve.py	1 Apr 2007 18:07:45 -0000	1.153
+++ depsolve.py	2 Apr 2007 01:30:36 -0000	1.154
@@ -884,10 +884,8 @@
 
             self.verbose_logger.log(logginglevels.INFO_2,
                                     "Checking deps for %s" %(txmbr,))
-            if txmbr.output_state in (TS_INSTALL, TS_TRUEINSTALL, TS_OBSOLETING):
+            if txmbr.output_state in TS_INSTALL_STATES:
                 ret.extend(self._checkInstall(txmbr))
-            elif txmbr.output_state in (TS_UPDATE,):
-                ret.extend(self._checkUpdate(txmbr))
             elif txmbr.output_state in TS_REMOVE_STATES:
                 ret.extend(self._checkRemove(txmbr))
             self.dcobj.already_seen[txmbr] = 1
@@ -1072,14 +1070,6 @@
                     member.setAsDep(txmbr.po)
         return ret
 
-    def _checkUpdate(self, txmbr):
-        ret = self._checkInstall(txmbr)
-        for oldpo in txmbr.updates:
-            for this_txmbr in self.tsInfo.getMembers(oldpo.pkgtup):
-                ret.extend(self._checkRemove(this_txmbr))
-        # this is probably incomplete, but it does create curious results
-        return ret
-
     def _checkRemove(self, txmbr):
         po = txmbr.po
         provs = po.returnPrco('provides')