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 4ff14185fd7a04105b07414cb24695486b8494c5..2c29411867ea8f9cb46a76d0ed6313d9d129da44 100644 (file)
--- 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