diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-13 22:05:52 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-13 22:05:52 -0800 |
| commit | e348dbd08e4aae2346566688d9a6b2c5637b4ebd (patch) | |
| tree | 211a6d7a9c16a5e5392f6115d349bbfc9e2a2680 /pym/_emerge/depgraph.py | |
| parent | depgraph: --nodeps overrides --deep (diff) | |
| download | portage-e348dbd08e4aae2346566688d9a6b2c5637b4ebd.tar.gz portage-e348dbd08e4aae2346566688d9a6b2c5637b4ebd.tar.bz2 portage-e348dbd08e4aae2346566688d9a6b2c5637b4ebd.zip | |
depgraph: remove redundant "empty" param checks
Since commit 878f166c5a06b0ab6c5a34dd658c878cc7605fe7, empty implies
deep = True, so these checks are redundant.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d6c74e4c7..8a616dc76 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -655,9 +655,8 @@ class depgraph(object): debug = "--debug" in self._frozen_config.myopts buildpkgonly = "--buildpkgonly" in self._frozen_config.myopts nodeps = "--nodeps" in self._frozen_config.myopts - empty = "empty" in self._dynamic_config.myparams deep = self._dynamic_config.myparams.get("deep", 0) - recurse = empty or deep is True or dep.depth <= deep + recurse = deep is True or dep.depth <= deep if dep.blocker: if not buildpkgonly and \ not nodeps and \ @@ -1037,8 +1036,7 @@ class depgraph(object): depth = 0 pkg.depth = depth deep = self._dynamic_config.myparams.get("deep", 0) - empty = "empty" in self._dynamic_config.myparams - recurse = empty or deep is True or depth + 1 <= deep + recurse = deep is True or depth + 1 <= deep dep_stack = self._dynamic_config._dep_stack if "recurse" not in self._dynamic_config.myparams: return 1 @@ -1097,8 +1095,7 @@ class depgraph(object): if not pkg.built and \ "--buildpkgonly" in self._frozen_config.myopts and \ - "deep" not in self._dynamic_config.myparams and \ - "empty" not in self._dynamic_config.myparams: + "deep" not in self._dynamic_config.myparams: edepend["RDEPEND"] = "" edepend["PDEPEND"] = "" @@ -3663,7 +3660,7 @@ class depgraph(object): depgraph_sets.sets.update(required_sets[root]) if "remove" not in self._dynamic_config.myparams and \ root == self._frozen_config.target_root and \ - (already_deep or "empty" in self._dynamic_config.myparams): + already_deep: remaining_args.difference_update(depgraph_sets.sets) if not remaining_args and \ not self._dynamic_config._ignored_deps and \ |