Inside depgraph.loadResumeCommand(), when appropriate, complete the graph

before analyzing any unsatisfied deps that may exist. (trunk r12547)

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ab035b461380144607394cffdbe2c9afd7cc0ff1..2b764fad6220c15cd875facb513f9f0bca00923c 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8500,8 +8500,14 @@ 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:
+                       for dep in self._unsatisfied_deps + \
+                               self._initially_unsatisfied_deps:
                                if not isinstance(dep.parent, Package):
                                        continue
                                if dep.parent.operation == "merge":