[yum-cvs] yum/depsolve.py

[Jeremy Katz]

 yum/depsolve.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e3f27100269b64a634c517803428f64ac1d32e47
Author: Jeremy Katz <katzj at redhat.com>
Date:   Mon Nov 26 11:25:46 2007 -0500

    Avoid missing deps
    
    We need to reset already_seen_removed as well as already_seen to avoid
    missing broken deps on a second run through resolveDeps().  (rh#397161)

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 55f7130..e026db2 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -698,9 +698,10 @@ class Depsolve(object):
         # holder object for things from the check
         if not hasattr(self, '_dcobj'):
             self._dcobj = DepCheck()
-        # reset what we've seen as things may have changed between calls
-        # to resolveDeps (rh#242368, rh#308321)
-        self._dcobj.already_seen = {}
+        else:
+            # reset what we've seen as things may have changed between calls
+            # to resolveDeps (rh#242368, rh#308321)
+            self._dcobj.reset()
 
         CheckDeps = True
         CheckRemoves = False
@@ -984,6 +985,9 @@ class DepCheck(object):
     def __init__(self):
         self.requires = []
         self.conflicts = []
+        self.reset()
+
+    def reset(self):
         self.already_seen = {}
         self.already_seen_removed = {}