Use a dict for depgraph params, so we can use it to store key/value pairs

and fix the depgraph so it doesn't use emerge options directly.

svn path=/main/trunk/; revision=13809

1 files changed, 9 insertions, 9 deletions

diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
index 78c79fe2d..77deb042d 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -12,11 +12,11 @@ def create_depgraph_params(myopts, myaction):
 	# empty:     pretend nothing is merged
 	# complete:  completely account for all known dependencies
 	# remove:    build graph for use in removing packages
-	myparams = set(["recurse"])
+	myparams = {"recurse" : True}
 
 	if myaction == "remove":
-		myparams.add("remove")
-		myparams.add("complete")
+		myparams["remove"] = True
+		myparams["complete"] = True
 		return myparams
 
 	if "--update" in myopts or \
@@ -24,15 +24,15 @@ def create_depgraph_params(myopts, myaction):
 		"--reinstall" in myopts or \
 		"--noreplace" in myopts or \
 		"--selective" in myopts:
-		myparams.add("selective")
+		myparams["selective"] = True
 	if "--emptytree" in myopts:
-		myparams.add("empty")
-		myparams.discard("selective")
+		myparams["empty"] = True
+		myparams.pop("selective", None)
 	if "--nodeps" in myopts:
-		myparams.discard("recurse")
+		myparams.pop("recurse", None)
 	if "--deep" in myopts:
-		myparams.add("deep")
+		myparams["deep"] = True
 	if "--complete-graph" in myopts:
-		myparams.add("complete")
+		myparams["complete"] = True
 	return myparams