diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-30 00:09:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-30 00:09:25 +0000 |
| commit | a1a04478d9eb5a00a3412f7f20309aa9e8c5bfe3 (patch) | |
| tree | 145ae3d3de15158662426063bc0f21cf48966b04 | |
| parent | 23a6875820516a2e65952e2f4e7fab92331e25eb (diff) | |
| download | portage-a1a04478d9eb5a00a3412f7f20309aa9e8c5bfe3.tar.gz portage-a1a04478d9eb5a00a3412f7f20309aa9e8c5bfe3.tar.bz2 portage-a1a04478d9eb5a00a3412f7f20309aa9e8c5bfe3.zip | |
Fix "deep" logic in depgraph._complete_graph() so that it always
properly recognizes whether or not "deep" was previously enabled.
svn path=/main/trunk/; revision=10039
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 86cc8d485..6b5b9914a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -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 |