summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-06 18:56:14 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-06 18:56:14 +0000
commit9df052e840e09c51790016c2b23597c04fc20d68 (patch)
tree20fa24dffa6321b2a98a4187a81cc6e9a5dff629
parenteb22a5cce321a0ffc7f19b96a4d5f27089240fa2 (diff)
downloadportage-9df052e840e09c51790016c2b23597c04fc20d68.tar.gz
portage-9df052e840e09c51790016c2b23597c04fc20d68.tar.bz2
portage-9df052e840e09c51790016c2b23597c04fc20d68.zip
Bug #287870 - Add -r option as short version of --resume.
svn path=/main/trunk/; revision=14504
-rw-r--r--man/emerge.12
-rw-r--r--pym/_emerge/help.py4
-rw-r--r--pym/_emerge/main.py1
3 files changed, 4 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index efe583064..23fb296bb 100644
--- 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 3cb5a9f54..5875cc29d 100644
--- 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 4635cdaf2..8afa37ddd 100644
--- 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",