emerge --select: add -w short option

diff --git a/man/emerge.1 b/man/emerge.1
index 356bb930d69bbbf3006cf2e0eecfc51b1583e565..0807a4b23e6d876ad4de86b5bb2b51f2d38fd8bc 100644 (file)
--- 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 a0d28702e2edea6bde4b3c176a497eaeb20a4a77..69f65051879c071424984536ace3b86012754d2e 100644 (file)
--- 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 6223a137d6eaed39decb7f492d42dcf434b9e5f8..96d6a16004acfde960b391bc1653b473c91e16c8 100644 (file)
--- 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",