summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-02 21:10:20 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-02 21:10:20 +0000
commit36eaf1b6b31b1f8547253cca9f1852a19d0bd9e0 (patch)
tree1f04f9dd772d1c53d62f3df7dc4bcdfc62b33ed1 /pym
parent0e40350730ea128cff6c45e56864eb90e63f54f6 (diff)
downloadportage-36eaf1b6b31b1f8547253cca9f1852a19d0bd9e0.tar.gz
portage-36eaf1b6b31b1f8547253cca9f1852a19d0bd9e0.tar.bz2
portage-36eaf1b6b31b1f8547253cca9f1852a19d0bd9e0.zip
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
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/depgraph.py4
1 files changed, 4 insertions, 0 deletions
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