| 1 |
commit: 84139803585a9a415c6f94c765dadcdeb7592915 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 22:34:42 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 22:34:42 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=84139803 |
| 7 |
|
| 8 |
emerge --select: add -w short option |
| 9 |
|
| 10 |
--- |
| 11 |
man/emerge.1 | 2 +- |
| 12 |
pym/_emerge/help.py | 4 ++-- |
| 13 |
pym/_emerge/main.py | 2 ++ |
| 14 |
3 files changed, 5 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 17 |
index 356bb93..0807a4b 100644 |
| 18 |
--- a/man/emerge.1 |
| 19 |
+++ b/man/emerge.1 |
| 20 |
@@ -726,7 +726,7 @@ If ebuilds using EAPIs which \fIdo not\fR support \fBHDEPEND\fR are built in |
| 21 |
the same \fBemerge\fR run as those using EAPIs which \fIdo\fR support |
| 22 |
\fBHDEPEND\fR, this option affects only the former. |
| 23 |
.TP |
| 24 |
-.BR "\-\-select [ y | n ]" |
| 25 |
+.BR "\-\-select [ y | n ] (\-w short option)" |
| 26 |
Add specified packages to the world set (inverse of |
| 27 |
\fB\-\-oneshot\fR). This is useful if you want to |
| 28 |
use \fBEMERGE_DEFAULT_OPTS\fR to make |
| 29 |
|
| 30 |
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py |
| 31 |
index a0d2870..69f6505 100644 |
| 32 |
--- a/pym/_emerge/help.py |
| 33 |
+++ b/pym/_emerge/help.py |
| 34 |
@@ -1,4 +1,4 @@ |
| 35 |
-# Copyright 1999-2011 Gentoo Foundation |
| 36 |
+# Copyright 1999-2012 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
from __future__ import print_function |
| 40 |
@@ -13,7 +13,7 @@ def help(): |
| 41 |
print(" "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >") |
| 42 |
print(" "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]") |
| 43 |
print(" "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("--verbose")+" ] ") |
| 44 |
- print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]") |
| 45 |
+ print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvVw")+"]") |
| 46 |
print(" [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]") |
| 47 |
print(" [ "+green("--complete-graph")+" ] [ "+green("--deep")+" ]") |
| 48 |
print(" [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + " ]") |
| 49 |
|
| 50 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 51 |
index 6223a13..96d6a16 100644 |
| 52 |
--- a/pym/_emerge/main.py |
| 53 |
+++ b/pym/_emerge/main.py |
| 54 |
@@ -169,6 +169,7 @@ def insert_optional_args(args): |
| 55 |
'K' : y_or_n, |
| 56 |
'q' : y_or_n, |
| 57 |
'v' : y_or_n, |
| 58 |
+ 'w' : y_or_n, |
| 59 |
} |
| 60 |
|
| 61 |
arg_stack = args[:] |
| 62 |
@@ -608,6 +609,7 @@ def parse_opts(tmpcmdline, silent=False): |
| 63 |
}, |
| 64 |
|
| 65 |
"--select": { |
| 66 |
+ "shortopt" : "-w", |
| 67 |
"help" : "add specified packages to the world set " + \ |
| 68 |
"(inverse of --oneshot)", |
| 69 |
"type" : "choice", |
Archives