[yum-cvs] yum/yum __init__.py,1.191,1.192 depsolve.py,1.79,1.80

[Jeremy Katz]

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

Modified Files:
	__init__.py depsolve.py 
Log Message:
handle deps changing as a result of a plugin run and re-run depsolve


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- __init__.py	2 Mar 2006 21:34:38 -0000	1.191
+++ __init__.py	3 Mar 2006 03:48:48 -0000	1.192
@@ -400,6 +400,10 @@
         self.plugins.run('preresolve')
         (rescode, restring) = self.resolveDeps()
         self.plugins.run('postresolve', rescode=rescode, restring=restring)
+
+        if self.tsInfo.changed:
+            (rescode, restring) = self.resolveDeps()
+            
         return rescode, restring
 
     def runTransaction(self, cb):

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- depsolve.py	28 Feb 2006 00:29:18 -0000	1.79
+++ depsolve.py	3 Mar 2006 03:48:48 -0000	1.80
@@ -180,6 +180,7 @@
 
             
             if not deps:
+                self.tsInfo.changed = False
                 return (2, ['Success - deps resolved'])
 
             deps = unique(deps) # get rid of duplicate deps            
@@ -250,8 +251,8 @@
                 self.log(4, 'Dependency Process ending')
 
             del deps
-            
 
+        self.tsInfo.changed = False
         if len(errors) > 0:
             return (1, errors)
         if len(self.tsInfo) > 0: