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

[James Bowes]

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

Modified Files:
	depsolve.py 
Log Message:
fix recent tscheck breakage

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- depsolve.py	1 Apr 2007 00:37:04 -0000	1.150
+++ depsolve.py	1 Apr 2007 14:04:29 -0000	1.151
@@ -912,7 +912,13 @@
         while CheckDeps:
             self.cheaterlookup = {} # short cache for some information we'd resolve
                                     # (needname, needversion) = pkgtup
-            if self.dsCallback: self.dsCallback.tscheck(len(self.tsInfo.getMembers()))
+            if self.dsCallback:
+                # FIXME: come up with a better way to support anaconda's
+                # callback along with everyone else's.
+                if self.dsCallback.tscheck.func_code.co_argcount == 2:
+                    self.dsCallback.tscheck(len(self.tsInfo.getMembers()))
+                else:
+                    self.dsCallback.tscheck()
             deps = self._mytsCheck()
 
             if not deps: