Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13872 - in main/trunk: man pym/_emerge
Date: Sat, 01 Aug 2009 18:58:25
Message-Id: E1MXJmh-0005Lx-NS@stork.gentoo.org
Author: zmedico
Date: 2009-08-01 18:58:23 +0000 (Sat, 01 Aug 2009)
New Revision: 13872

Modified:
   main/trunk/man/emerge.1
   main/trunk/pym/_emerge/help.py
   main/trunk/pym/_emerge/main.py
Log:
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.


Modified: main/trunk/man/emerge.1
===================================================================
--- main/trunk/man/emerge.1	2009-08-01 10:01:19 UTC (rev 13871)
+++ main/trunk/man/emerge.1	2009-08-01 18:58:23 UTC (rev 13872)
@@ -281,7 +281,7 @@
 Used alongside \fB\-\-pretend\fR to cause the package name, new version, 
 and old version to be displayed in an aligned format for easy cut\-n\-paste.
 .TP
-.BR "\-\-complete\-graph"
+.BR "\-\-complete\-graph[=n]"
 This causes \fBemerge\fR to consider the deep dependencies of all
 packages from the system and world sets. With this option enabled,
 \fBemerge\fR will bail out if it determines that the given operation will

Modified: main/trunk/pym/_emerge/help.py
===================================================================
--- main/trunk/pym/_emerge/help.py	2009-08-01 10:01:19 UTC (rev 13871)
+++ main/trunk/pym/_emerge/help.py	2009-08-01 18:58:23 UTC (rev 13872)
@@ -287,7 +287,7 @@
 		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" + \

Modified: main/trunk/pym/_emerge/main.py
===================================================================
--- main/trunk/pym/_emerge/main.py	2009-08-01 10:01:19 UTC (rev 13871)
+++ main/trunk/pym/_emerge/main.py	2009-08-01 18:58:23 UTC (rev 13872)
@@ -48,7 +48,6 @@
 "--ask",          "--alphabetical",
 "--buildpkg",     "--buildpkgonly",
 "--changelog",    "--columns",
-"--complete-graph",
 "--debug",
 "--digest",
 "--emptytree",
@@ -383,6 +382,7 @@
 	new_args = []
 
 	default_arg_opts = {
+		'--complete-graph' : ('n',),
 		'--deep'       : valid_integers,
 		'--deselect'   : ('n',),
 		'--binpkg-respect-use'   : ('n', 'y',),
@@ -490,6 +490,12 @@
 			"choices":("y", "n")
 		},
 
+		"--complete-graph": {
+			"help"    : "completely account for all known dependencies",
+			"type"    : "choice",
+			"choices" : ("True", "n")
+		},
+
 		"--deep": {
 
 			"shortopt" : "-D",
@@ -595,6 +601,11 @@
 	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