From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 1 Mar 2010 01:06:24 +0000 (-0000)
Subject: Bug #307235 - Inside depgraph._add_dep, discard child choices for deps that
X-Git-Tag: v2.2_rc64~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ee24c5a75529bbd221dd922e8c72eae929e002c;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.

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

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2ad67713b..65144187b 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