diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-30 00:11:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-30 00:11:58 +0000 |
| commit | 6e52d2b622e089e9dfc3eb814e4bba3e670cae83 (patch) | |
| tree | c651f07ad7e43a440269644cb361ed68d485c1f2 | |
| parent | 4ecd3597067cf059b72aa4ade156fc9905604357 (diff) | |
| download | portage-6e52d2b622e089e9dfc3eb814e4bba3e670cae83.tar.gz portage-6e52d2b622e089e9dfc3eb814e4bba3e670cae83.tar.bz2 portage-6e52d2b622e089e9dfc3eb814e4bba3e670cae83.zip | |
Fix "deep" logic in depgraph._complete_graph() so that it always
properly recognizes whether or not "deep" was previously enabled.
(trunk r10039)
svn path=/main/branches/2.1.2/; revision=10040
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index 9753386ed..8c5557f04 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3185,12 +3185,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 |