Fix "deep" logic in depgraph._complete_graph() so that it always
authorZac Medico <zmedico@gentoo.org>
Wed, 30 Apr 2008 00:09:25 +0000 (00:09 -0000)
committerZac Medico <zmedico@gentoo.org>
Wed, 30 Apr 2008 00:09:25 +0000 (00:09 -0000)
properly recognizes whether or not "deep" was previously enabled.

svn path=/main/trunk/; revision=10039

pym/_emerge/__init__.py

index 86cc8d485c9a045e1a143a435543b90e7254e799..6b5b9914ab27f673116b981d0fc024c138001857 100644 (file)
@@ -3038,12 +3038,14 @@ class depgraph(object):
                # accounted for.
                self._select_atoms = self._select_atoms_from_graph
                self._select_package = self._select_pkg_from_graph
-               self.myparams.add("deep")
+               already_deep = "deep" in self.myparams
+               if not already_deep:
+                       self.myparams.add("deep")
 
                for root in self.roots:
                        required_set_names = self._required_set_names.copy()
                        if root == self.target_root and \
-                               ("deep" in self.myparams or "empty" in self.myparams):
+                               (already_deep or "empty" in self.myparams):
                                required_set_names.difference_update(self._sets)
                        if not required_set_names and not self._ignored_deps:
                                continue