[yum-cvs] yum-utils/plugins/skip-broken skip-broken.py,1.3,1.4

[Tim Lauridsen]

Update of /home/groups/yum/cvs/yum-utils/plugins/skip-broken
In directory login1.linux.duke.edu:/tmp/cvs-serv15598/plugins/skip-broken

Modified Files:
	skip-broken.py 
Log Message:
more clean fix for work with latest yum api

Index: skip-broken.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/plugins/skip-broken/skip-broken.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skip-broken.py	1 Mar 2007 09:31:03 -0000	1.3
+++ skip-broken.py	1 Mar 2007 18:26:15 -0000	1.4
@@ -37,12 +37,14 @@
     def resetTs(self):
         '''Clear the current tsInfo Transaction Set'''
         # clear current tsInfo, we want a empty one.
-        if hasattr(self,'_tsInfo'):
-            self._tsInfo = None
-        else:                     # support yum < 3.1.3
-            del self.tsInfo
-            self.tsInfo = self._transactionDataFactory()
-            self.initActionTs()
+        del self.base.tsInfo
+        # if yum < 3.1.3, we have setup a new tsInfo
+        # FIXME: This should be something like:
+        # if yum.__version__ < '3.1.3':
+        # but we have to wait to yum cvs head version is bumped.
+        if not hasattr(self.base,'_tsInfo'):
+            self.base.tsInfo = self._transactionDataFactory()
+            self.base.initActionTs()
 
     def preDepCheck(self):
         '''
@@ -105,9 +107,10 @@
             cd = CheckDependency(base,conduit.info)
             cd.dumpTsInfo()
             (good,bad) = cd.preDepCheck()
+            tsInfo = base.tsInfo
             for txmbr,err in bad:
                 # Removing bad packages for self.tsInfo
-                base.tsInfo.remove(txmbr.po.pkgtup)
+                tsInfo.remove(txmbr.po.pkgtup)
                 conduit.info(2,"%s failed dependency resolving " % txmbr.po)
                 conduit.info(2,"%s " % err[0])
             for txmbr in good: