[yum-cvs] yum/yum depsolve.py,1.155,1.156
Jeremy Katz
katzj at linux.duke.edu
Tue Apr 3 21:24:26 UTC 2007
Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv25435/yum
Modified Files:
depsolve.py
Log Message:
I made anaconda's tscheck callback less crappy.
Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- depsolve.py 3 Apr 2007 17:57:55 -0000 1.155
+++ depsolve.py 3 Apr 2007 21:24:24 -0000 1.156
@@ -905,13 +905,7 @@
while CheckDeps:
self.cheaterlookup = {} # short cache for some information we'd resolve
# (needname, needversion) = pkgtup
- 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()
+ if self.dsCallback: self.dsCallback.tscheck()
deps = self._mytsCheck()
if not deps:
More information about the Yum-cvs-commits
mailing list