1 |
Author: zmedico |
2 |
Date: 2008-04-30 00:11:58 +0000 (Wed, 30 Apr 2008) |
3 |
New Revision: 10040 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/emerge |
7 |
Log: |
8 |
Fix "deep" logic in depgraph._complete_graph() so that it always |
9 |
properly recognizes whether or not "deep" was previously enabled. |
10 |
(trunk r10039) |
11 |
|
12 |
|
13 |
Modified: main/branches/2.1.2/bin/emerge |
14 |
=================================================================== |
15 |
--- main/branches/2.1.2/bin/emerge 2008-04-30 00:09:25 UTC (rev 10039) |
16 |
+++ main/branches/2.1.2/bin/emerge 2008-04-30 00:11:58 UTC (rev 10040) |
17 |
@@ -3185,12 +3185,14 @@ |
18 |
# accounted for. |
19 |
self._select_atoms = self._select_atoms_from_graph |
20 |
self._select_package = self._select_pkg_from_graph |
21 |
- self.myparams.add("deep") |
22 |
+ already_deep = "deep" in self.myparams |
23 |
+ if not already_deep: |
24 |
+ self.myparams.add("deep") |
25 |
|
26 |
for root in self.roots: |
27 |
required_set_names = self._required_set_names.copy() |
28 |
if root == self.target_root and \ |
29 |
- ("deep" in self.myparams or "empty" in self.myparams): |
30 |
+ (already_deep or "empty" in self.myparams): |
31 |
required_set_names.difference_update(self._sets) |
32 |
if not required_set_names and not self._ignored_deps: |
33 |
continue |
34 |
|
35 |
-- |
36 |
gentoo-commits@l.g.o mailing list |