From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Jan 2009 05:55:24 +0000 (-0000)
Subject: Inside depgraph.loadResumeCommand(), when appropriate, complete the graph
X-Git-Tag: v2.2_rc24~250
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1ed16fbb367da5c0652c4f81f7efe22b8f3ee58;p=portage.git

Inside depgraph.loadResumeCommand(), when appropriate, complete the graph
before analyzing any unsatisfied deps that may exist.

svn path=/main/trunk/; revision=12547
---

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":