summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-22 05:55:24 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-22 05:55:24 +0000
commitf1ed16fbb367da5c0652c4f81f7efe22b8f3ee58 (patch)
tree3c6d7391532fa48793ddc9536ec963600338bcb6
parentfbadf83bb62557e5d9814fbbed4a1268855f56ee (diff)
downloadportage-f1ed16fbb367da5c0652c4f81f7efe22b8f3ee58.tar.gz
portage-f1ed16fbb367da5c0652c4f81f7efe22b8f3ee58.tar.bz2
portage-f1ed16fbb367da5c0652c4f81f7efe22b8f3ee58.zip
Inside depgraph.loadResumeCommand(), when appropriate, complete the graph
before analyzing any unsatisfied deps that may exist. svn path=/main/trunk/; revision=12547
-rw-r--r--pym/_emerge/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 1e875bbaa..12da319ab 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8516,8 +8516,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":