diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-01 18:58:23 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-01 18:58:23 +0000 |
| commit | 8d280b019ca49ef855d53c389be761c1a9a1eb90 (patch) | |
| tree | d09288b84a2c1ccbe5d54a706242836b8b1b1507 | |
| parent | 19ea72f4c885f121490ddce77c8528e01f850f4f (diff) | |
| download | portage-8d280b019ca49ef855d53c389be761c1a9a1eb90.tar.gz portage-8d280b019ca49ef855d53c389be761c1a9a1eb90.tar.bz2 portage-8d280b019ca49ef855d53c389be761c1a9a1eb90.zip | |
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
| -rw-r--r-- | man/emerge.1 | 2 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/main.py | 13 |
3 files changed, 14 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 07f511fa4..45cf95155 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -281,7 +281,7 @@ is not a tty (by default, color is disabled unless stdout is a tty). 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 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 |