depgraph: --nodeps overrides --deep
authorZac Medico <zmedico@gentoo.org>
Mon, 14 Feb 2011 05:50:29 +0000 (21:50 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 14 Feb 2011 05:50:29 +0000 (21:50 -0800)
pym/_emerge/create_depgraph_params.py

index 454363e6ab7be63054dc3c94c8c21d5c0d0d6681..b0b49b3472de850e55be9ba932564e6c0f86a706 100644 (file)
@@ -29,8 +29,7 @@ def create_depgraph_params(myopts, myaction):
                "--noreplace" in myopts or \
                myopts.get("--selective", "n") != "n":
                myparams["selective"] = True
-       if "--nodeps" in myopts:
-               myparams.pop("recurse", None)
+
        if "--deep" in myopts:
                myparams["deep"] = myopts["--deep"]
        if "--complete-graph" in myopts:
@@ -40,6 +39,10 @@ def create_depgraph_params(myopts, myaction):
                myparams["deep"] = True
                myparams.pop("selective", None)
 
+       if "--nodeps" in myopts:
+               myparams.pop("recurse", None)
+               myparams.pop("deep", None)
+
        rebuilt_binaries = myopts.get('--rebuilt-binaries')
        if rebuilt_binaries is True or \
                rebuilt_binaries != 'n' and \