From 8d280b019ca49ef855d53c389be761c1a9a1eb90 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Aug 2009 18:58:23 +0000
Subject: Add support for --complete-graph=n so that it's possible to disable
 it on the command line after it's been enabled in EMERGE_DEFAULT_OPTS.

svn path=/main/trunk/; revision=13872
---
 pym/_emerge/help.py |  2 +-
 pym/_emerge/main.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'pym/_emerge')

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 393886698..4c4525a4d 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -287,7 +287,7 @@ def help(myopts, havecolor=1):
 		print "              Display the pretend output in a tabular form. Versions are"
 		print "              aligned vertically."
 		print
-		print "       "+green("--complete-graph")
+		print "       "+green("--complete-graph") + "[=%s]" % turquoise("n")
 		desc = "This causes emerge to consider the deep dependencies of all" + \
 			" packages from the system and world sets. With this option enabled," + \
 			" emerge will bail out if it determines that the given operation will" + \
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index dae28fa66..fbdcc58f5 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -48,7 +48,6 @@ options=[
 "--ask",          "--alphabetical",
 "--buildpkg",     "--buildpkgonly",
 "--changelog",    "--columns",
-"--complete-graph",
 "--debug",
 "--digest",
 "--emptytree",
@@ -383,6 +382,7 @@ def insert_optional_args(args):
 	new_args = []
 
 	default_arg_opts = {
+		'--complete-graph' : ('n',),
 		'--deep'       : valid_integers,
 		'--deselect'   : ('n',),
 		'--binpkg-respect-use'   : ('n', 'y',),
@@ -490,6 +490,12 @@ def parse_opts(tmpcmdline, silent=False):
 			"choices":("y", "n")
 		},
 
+		"--complete-graph": {
+			"help"    : "completely account for all known dependencies",
+			"type"    : "choice",
+			"choices" : ("True", "n")
+		},
+
 		"--deep": {
 
 			"shortopt" : "-D",
@@ -595,6 +601,11 @@ def parse_opts(tmpcmdline, silent=False):
 	else:
 		myoptions.binpkg_respect_use = None
 
+	if myoptions.complete_graph in ("y", "True",):
+		myoptions.complete_graph = True
+	else:
+		myoptions.complete_graph = None
+
 	if myoptions.root_deps == "True":
 		myoptions.root_deps = True
 
-- 
cgit v1.2.3-1-g7c22