summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-02-13 01:06:39 -0800
committerZac Medico <zmedico@gentoo.org>2011-02-13 01:06:39 -0800
commit878f166c5a06b0ab6c5a34dd658c878cc7605fe7 (patch)
tree1437543fe789456f939abde7807cc664e937f188
parentc2938a7fb389440460250e36c18049528e8157b8 (diff)
downloadportage-878f166c5a06b0ab6c5a34dd658c878cc7605fe7.tar.gz
portage-878f166c5a06b0ab6c5a34dd658c878cc7605fe7.tar.bz2
portage-878f166c5a06b0ab6c5a34dd658c878cc7605fe7.zip
depgraph: make empty param imply deep = True
This won't change the existing depgraph behavior, but it will allow logic to be simplified in some cases such that solely the deep param needs to be consulted (rather than needing to consult both empty and deep params).
-rw-r--r--pym/_emerge/create_depgraph_params.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
index 375332e90..454363e6a 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -29,15 +29,16 @@ def create_depgraph_params(myopts, myaction):
"--noreplace" in myopts or \
myopts.get("--selective", "n") != "n":
myparams["selective"] = True
- if "--emptytree" in myopts:
- myparams["empty"] = True
- myparams.pop("selective", None)
if "--nodeps" in myopts:
myparams.pop("recurse", None)
if "--deep" in myopts:
myparams["deep"] = myopts["--deep"]
if "--complete-graph" in myopts:
myparams["complete"] = True
+ if "--emptytree" in myopts:
+ myparams["empty"] = True
+ myparams["deep"] = True
+ myparams.pop("selective", None)
rebuilt_binaries = myopts.get('--rebuilt-binaries')
if rebuilt_binaries is True or \