Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15503 - main/trunk/pym/_emerge
Date: Mon, 01 Mar 2010 01:06:30
Message-Id: E1Nlu5Z-00084P-7i@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-03-01 01:06:24 +0000 (Mon, 01 Mar 2010)
3 New Revision: 15503
4
5 Modified:
6 main/trunk/pym/_emerge/depgraph.py
7 Log:
8 Bug #307235 - Inside depgraph._add_dep, discard child choices for deps that
9 will be not be processed immediately, since "complete" mode may select a
10 different child later.
11
12
13 Modified: main/trunk/pym/_emerge/depgraph.py
14 ===================================================================
15 --- main/trunk/pym/_emerge/depgraph.py 2010-02-28 20:35:44 UTC (rev 15502)
16 +++ main/trunk/pym/_emerge/depgraph.py 2010-03-01 01:06:24 UTC (rev 15503)
17 @@ -827,6 +827,10 @@
18 # should have been masked.
19 raise
20 if not myarg:
21 + # Existing child selection may not be valid unless
22 + # it's added to the graph immediately, since "complete"
23 + # mode may select a different child later.
24 + dep.child = None
25 self._dynamic_config._ignored_deps.append(dep)
26 return 1