Inside depgraph.loadResumeCommand(), always enable deep traversal of

dependencies. This is necessary for correct --keep-going or --resume operation
in case a package from a group of circularly dependent packages fails.
(trunk r12548)

svn path=/main/branches/2.1.6/; revision=12834

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 2b764fad6220c15cd875facb513f9f0bca00923c..7002335ddfa99558f8e3c0bfa9e06dcb9fe027fb 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8467,6 +8467,19 @@ class depgraph(object):
                else:
                        self._select_package = self._select_pkg_from_graph
                        self.myparams.add("selective")
+                       # Always traverse deep dependencies in order to account for
+                       # potentially unsatisfied dependencies of installed packages.
+                       # This is necessary for correct --keep-going or --resume operation
+                       # in case a package from a group of circularly dependent packages
+                       # fails. In this case, a package which has recently been installed
+                       # may have an unsatisfied circular dependency (pulled in by
+                       # PDEPEND, for example). So, even though a package is already
+                       # installed, it may not have all of it's dependencies satisfied, so
+                       # it may not be usable. If such a package is in the subgraph of
+                       # deep depenedencies of a scheduled build, that build needs to
+                       # be cancelled. In order for this type of situation to be
+                       # recognized, deep traversal of dependencies is required.
+                       self.myparams.add("deep")
 
                        favorites = resume_data.get("favorites")
                        args_set = self._sets["args"]
@@ -8500,14 +8513,8 @@ class depgraph(object):
                        if not self._create_graph(allow_unsatisfied=True):
                                return False
 
-                       # When appropriate, complete the graph before analyzing
-                       # any unsatisfied deps that may exist.
-                       if not self._complete_graph():
-                               return False
-
                        unsatisfied_deps = []
-                       for dep in self._unsatisfied_deps + \
-                               self._initially_unsatisfied_deps:
+                       for dep in self._unsatisfied_deps:
                                if not isinstance(dep.parent, Package):
                                        continue
                                if dep.parent.operation == "merge":