depgraph: remove redundant "empty" param checks
authorZac Medico <zmedico@gentoo.org>
Mon, 14 Feb 2011 06:05:52 +0000 (22:05 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 14 Feb 2011 06:05:52 +0000 (22:05 -0800)
Since commit 878f166c5a06b0ab6c5a34dd658c878cc7605fe7, empty implies
deep = True, so these checks are redundant.

pym/_emerge/depgraph.py

index d6c74e4c781e844b9e8d0faa95da1e29e6316998..8a616dc76068f1846af60181f3d4b447d6e0d80a 100644 (file)
@@ -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 \