Bug #287870 - Add -r option as short version of --resume.

svn path=/main/trunk/; revision=14504

diff --git a/man/emerge.1 b/man/emerge.1
index efe583064d0e73076b3b6f98ee602705bc416ecb..23fb296bb6ebb5af6e7a2cb3b064c617234a1233 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -182,7 +182,7 @@ a sync operation. In order to specify parallel \fB\-\-regen\fR behavior, use
 the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to
 generate and distribute cache for use by others, use \fBegencache\fR(1).
 .TP
-.BR "\-\-resume"
+.BR "\-\-resume" (\fB\-r\fR)
 Resumes the most recent merge list that has been aborted due to an error.
 Please note that this operation will only return an error on failure.  If there
 is nothing for portage to do, then portage will exit with a message and a

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 3cb5a9f541924f785d9f897d0965c650f6d75860..5875cc29d5cf547c89d5f3b529e6023d8a3ef683 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -14,7 +14,7 @@ def shorthelp():
        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("abBcCdDefgGhjkKlnNoOpqPsStuvV")+"]")
+       print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]")
        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") + "            ]")
@@ -161,7 +161,7 @@ def help(myopts, havecolor=1):
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()
-               print("       "+green("--resume"))
+               print("       "+green("--resume")+" ("+green("-r")+" short option)")
                print("              Resumes the most recent merge list that has been aborted due to an")
                print("              error. Please note that this operation will only return an error")
                print("              on failure. If there is nothing for portage to do, then portage")

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 4635cdaf231c4351e38e80f30bdb9ed73bd0018c..8afa37dddf8d96c6da38f417832a53f222576675 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -83,6 +83,7 @@ shortmapping={
 "o":"--onlydeps",  "O":"--nodeps",
 "p":"--pretend",   "P":"--prune",
 "q":"--quiet",
+"r":"--resume",
 "s":"--search",    "S":"--searchdesc",
 "t":"--tree",
 "u":"--update",