[yum-cvs] yum/yum depsolve.py,1.67.2.1,1.67.2.2
Seth Vidal
skvidal at login.linux.duke.edu
Wed Nov 16 03:04:10 UTC 2005
Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv9538
Modified Files:
Tag: yum-2_4_X
depsolve.py
Log Message:
ts.check() can be None - don't unique if it is - bug #520 - thanks to
dgregor
Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -u -r1.67.2.1 -r1.67.2.2
--- depsolve.py 7 Nov 2005 05:07:11 -0000 1.67.2.1
+++ depsolve.py 16 Nov 2005 03:04:08 -0000 1.67.2.2
@@ -211,11 +211,13 @@
self.populateTs(test=1)
if self.dsCallback: self.dsCallback.tscheck()
deps = self.ts.check()
- deps = unique(deps) # get rid of duplicate deps
+
if not deps:
return (2, ['Success - deps resolved'])
-
+
+ deps = unique(deps) # get rid of duplicate deps
+
if deps == depscopy:
unresolveableloop += 1
self.log(5, 'Identical Loop count = %d' % unresolveableloop)
More information about the Yum-cvs-commits
mailing list