From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 21:10:20 +0000 (-0000)
Subject: Bug #307235 - Inside depgraph._add_dep, discard child choices for deps that
X-Git-Tag: v2.1.8~22
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=36eaf1b6b31b1f8547253cca9f1852a19d0bd9e0;p=portage.git

Bug #307235 - Inside depgraph._add_dep, discard child choices for deps that
will be not be processed immediately, since "complete" mode may select a
different child later. (trunk r15503)

svn path=/main/branches/2.1.7/; revision=15701
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 4ff14185f..2c2941186 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -827,6 +827,10 @@ class depgraph(object):
 						# should have been masked.
 						raise
 			if not myarg:
+				# Existing child selection may not be valid unless
+				# it's added to the graph immediately, since "complete"
+				# mode may select a different child later.
+				dep.child = None
 				self._dynamic_config._ignored_deps.append(dep)
 				return 1