| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-01 18:58:23 +0000 (Sat, 01 Aug 2009) |
| 3 |
New Revision: 13872 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/man/emerge.1 |
| 7 |
main/trunk/pym/_emerge/help.py |
| 8 |
main/trunk/pym/_emerge/main.py |
| 9 |
Log: |
| 10 |
Add support for --complete-graph=n so that it's possible to disable it on |
| 11 |
the command line after it's been enabled in EMERGE_DEFAULT_OPTS. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/man/emerge.1 |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/man/emerge.1 2009-08-01 10:01:19 UTC (rev 13871) |
| 17 |
+++ main/trunk/man/emerge.1 2009-08-01 18:58:23 UTC (rev 13872) |
| 18 |
@@ -281,7 +281,7 @@ |
| 19 |
Used alongside \fB\-\-pretend\fR to cause the package name, new version, |
| 20 |
and old version to be displayed in an aligned format for easy cut\-n\-paste. |
| 21 |
.TP |
| 22 |
-.BR "\-\-complete\-graph" |
| 23 |
+.BR "\-\-complete\-graph[=n]" |
| 24 |
This causes \fBemerge\fR to consider the deep dependencies of all |
| 25 |
packages from the system and world sets. With this option enabled, |
| 26 |
\fBemerge\fR will bail out if it determines that the given operation will |
| 27 |
|
| 28 |
Modified: main/trunk/pym/_emerge/help.py |
| 29 |
=================================================================== |
| 30 |
--- main/trunk/pym/_emerge/help.py 2009-08-01 10:01:19 UTC (rev 13871) |
| 31 |
+++ main/trunk/pym/_emerge/help.py 2009-08-01 18:58:23 UTC (rev 13872) |
| 32 |
@@ -287,7 +287,7 @@ |
| 33 |
print " Display the pretend output in a tabular form. Versions are" |
| 34 |
print " aligned vertically." |
| 35 |
print |
| 36 |
- print " "+green("--complete-graph") |
| 37 |
+ print " "+green("--complete-graph") + "[=%s]" % turquoise("n") |
| 38 |
desc = "This causes emerge to consider the deep dependencies of all" + \ |
| 39 |
" packages from the system and world sets. With this option enabled," + \ |
| 40 |
" emerge will bail out if it determines that the given operation will" + \ |
| 41 |
|
| 42 |
Modified: main/trunk/pym/_emerge/main.py |
| 43 |
=================================================================== |
| 44 |
--- main/trunk/pym/_emerge/main.py 2009-08-01 10:01:19 UTC (rev 13871) |
| 45 |
+++ main/trunk/pym/_emerge/main.py 2009-08-01 18:58:23 UTC (rev 13872) |
| 46 |
@@ -48,7 +48,6 @@ |
| 47 |
"--ask", "--alphabetical", |
| 48 |
"--buildpkg", "--buildpkgonly", |
| 49 |
"--changelog", "--columns", |
| 50 |
-"--complete-graph", |
| 51 |
"--debug", |
| 52 |
"--digest", |
| 53 |
"--emptytree", |
| 54 |
@@ -383,6 +382,7 @@ |
| 55 |
new_args = [] |
| 56 |
|
| 57 |
default_arg_opts = { |
| 58 |
+ '--complete-graph' : ('n',), |
| 59 |
'--deep' : valid_integers, |
| 60 |
'--deselect' : ('n',), |
| 61 |
'--binpkg-respect-use' : ('n', 'y',), |
| 62 |
@@ -490,6 +490,12 @@ |
| 63 |
"choices":("y", "n") |
| 64 |
}, |
| 65 |
|
| 66 |
+ "--complete-graph": { |
| 67 |
+ "help" : "completely account for all known dependencies", |
| 68 |
+ "type" : "choice", |
| 69 |
+ "choices" : ("True", "n") |
| 70 |
+ }, |
| 71 |
+ |
| 72 |
"--deep": { |
| 73 |
|
| 74 |
"shortopt" : "-D", |
| 75 |
@@ -595,6 +601,11 @@ |
| 76 |
else: |
| 77 |
myoptions.binpkg_respect_use = None |
| 78 |
|
| 79 |
+ if myoptions.complete_graph in ("y", "True",): |
| 80 |
+ myoptions.complete_graph = True |
| 81 |
+ else: |
| 82 |
+ myoptions.complete_graph = None |
| 83 |
+ |
| 84 |
if myoptions.root_deps == "True": |
| 85 |
myoptions.root_deps = True |
Archives