[gentoo-commits] proj/portage:master commit in: lib/_emerge/, man/

[Zac Medico]

commit:     9481eb7056aadff45cf4051e9a0b87e9e5f9d48d
Author:     Greg Kubaryk <kurly <AT> vt <DOT> edu>
AuthorDate: Sun Mar 28 06:35:27 2021 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 06:36:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9481eb70

emerge: add -W option short for --deselect

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/_emerge/help.py | 2 +-
 lib/_emerge/main.py | 2 ++
 man/emerge.1        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/_emerge/help.py b/lib/_emerge/help.py
index 15e1941ca..d9faf0c4b 100644
--- a/lib/_emerge/help.py
+++ b/lib/_emerge/help.py
@@ -11,7 +11,7 @@ def emerge_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"))
-       print(bold("Options:")+" 
"+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuUvVw")+"]")
+       print(bold("Options:")+" 
"+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuUvVwW")+"]")
        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/lib/_emerge/main.py b/lib/_emerge/main.py
index 0ac25ea36..31e690584 100644
--- a/lib/_emerge/main.py
+++ b/lib/_emerge/main.py
@@ -187,6 +187,7 @@ def insert_optional_args(args):
                'q' : y_or_n,
                'v' : y_or_n,
                'w' : y_or_n,
+               'W' : y_or_n,
        }
 
        arg_stack = args[:]
@@ -470,6 +471,7 @@ def parse_opts(tmpcmdline, silent=False):
                },
 
                "--deselect": {
+                       "shortopt" : "-W",
                        "help"    : "remove atoms/sets from the world file",
                        "choices" : true_y_or_n
                },

diff --git a/man/emerge.1 b/man/emerge.1
index ad7f81ae7..33416d986 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -155,7 +155,7 @@ unmerge matched packages that have no reverse dependencies. 
Use
 \fB\-\-depclean\fR together with \fB\-\-verbose\fR to show reverse
 dependencies.
 .TP
-.BR "\-\-deselect [ y | n ]"
+.BR "\-\-deselect [ y | n ]", " \-W
 Remove atoms and/or sets from the world file. This action is implied
 by uninstall actions, including \fB-\-depclean\fR,
 \fB-\-prune\fR and \fB-\-unmerge\fR. Use \fB-\-deselect=n\fR