Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r10039 - main/trunk/pym/_emerge
Date: Wed, 30 Apr 2008 00:09:29
Message-Id: E1Jqzt0-0005mV-JI@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-04-30 00:09:25 +0000 (Wed, 30 Apr 2008)
3 New Revision: 10039
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
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
11
12 Modified: main/trunk/pym/_emerge/__init__.py
13 ===================================================================
14 --- main/trunk/pym/_emerge/__init__.py 2008-04-29 18:33:35 UTC (rev 10038)
15 +++ main/trunk/pym/_emerge/__init__.py 2008-04-30 00:09:25 UTC (rev 10039)
16 @@ -3038,12 +3038,14 @@
17 # accounted for.
18 self._select_atoms = self._select_atoms_from_graph
19 self._select_package = self._select_pkg_from_graph
20 - self.myparams.add("deep")
21 + already_deep = "deep" in self.myparams
22 + if not already_deep:
23 + self.myparams.add("deep")
24
25 for root in self.roots:
26 required_set_names = self._required_set_names.copy()
27 if root == self.target_root and \
28 - ("deep" in self.myparams or "empty" in self.myparams):
29 + (already_deep or "empty" in self.myparams):
30 required_set_names.difference_update(self._sets)
31 if not required_set_names and not self._ignored_deps:
32 continue
33
34 --
35 gentoo-commits@l.g.o mailing list