From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 14 Feb 2011 05:50:29 +0000 (-0800)
Subject: depgraph: --nodeps overrides --deep
X-Git-Tag: v2.1.9.40~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aec8506a120c4350e20fe015b242f781f80870c2;p=portage.git

depgraph: --nodeps overrides --deep
---

diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
index 454363e6a..b0b49b347 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -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 \