summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-12-29 14:34:42 -0800
committerZac Medico <zmedico@gentoo.org>2012-12-29 14:34:42 -0800
commit84139803585a9a415c6f94c765dadcdeb7592915 (patch)
tree7ed7053a29cec5e5bee9caf1654dd3e33b721566
parentd6bde84bd02aba99bbf7ee5a6a0e55d2be4216ff (diff)
downloadportage-84139803585a9a415c6f94c765dadcdeb7592915.tar.gz
portage-84139803585a9a415c6f94c765dadcdeb7592915.tar.bz2
portage-84139803585a9a415c6f94c765dadcdeb7592915.zip
emerge --select: add -w short option
-rw-r--r--man/emerge.12
-rw-r--r--pym/_emerge/help.py4
-rw-r--r--pym/_emerge/main.py2
3 files changed, 5 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 356bb930d..0807a4b23 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -726,7 +726,7 @@ If ebuilds using EAPIs which \fIdo not\fR support \fBHDEPEND\fR are built in
the same \fBemerge\fR run as those using EAPIs which \fIdo\fR support
\fBHDEPEND\fR, this option affects only the former.
.TP
-.BR "\-\-select [ y | n ]"
+.BR "\-\-select [ y | n ] (\-w short option)"
Add specified packages to the world set (inverse of
\fB\-\-oneshot\fR). This is useful if you want to
use \fBEMERGE_DEFAULT_OPTS\fR to make
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index a0d28702e..69f650518 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -13,7 +13,7 @@ def help():
print(" "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >")
print(" "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]")
print(" "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("--verbose")+" ] ")
- print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]")
+ print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvVw")+"]")
print(" [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]")
print(" [ "+green("--complete-graph")+" ] [ "+green("--deep")+" ]")
print(" [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + " ]")
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 6223a137d..96d6a1600 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -169,6 +169,7 @@ def insert_optional_args(args):
'K' : y_or_n,
'q' : y_or_n,
'v' : y_or_n,
+ 'w' : y_or_n,
}
arg_stack = args[:]
@@ -608,6 +609,7 @@ def parse_opts(tmpcmdline, silent=False):
},
"--select": {
+ "shortopt" : "-w",
"help" : "add specified packages to the world set " + \
"(inverse of --oneshot)",
"type" : "choice",