| 1 |
Author: zmedico |
| 2 |
Date: 2009-10-06 18:56:14 +0000 (Tue, 06 Oct 2009) |
| 3 |
New Revision: 14504 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/man/emerge.1 |
| 7 |
main/trunk/pym/_emerge/help.py |
| 8 |
main/trunk/pym/_emerge/main.py |
| 9 |
Log: |
| 10 |
Bug #287870 - Add -r option as short version of --resume. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/man/emerge.1 |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/man/emerge.1 2009-10-06 08:20:16 UTC (rev 14503) |
| 16 |
+++ main/trunk/man/emerge.1 2009-10-06 18:56:14 UTC (rev 14504) |
| 17 |
@@ -182,7 +182,7 @@ |
| 18 |
the \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. If you would like to |
| 19 |
generate and distribute cache for use by others, use \fBegencache\fR(1). |
| 20 |
.TP |
| 21 |
-.BR "\-\-resume" |
| 22 |
+.BR "\-\-resume" (\fB\-r\fR) |
| 23 |
Resumes the most recent merge list that has been aborted due to an error. |
| 24 |
Please note that this operation will only return an error on failure. If there |
| 25 |
is nothing for portage to do, then portage will exit with a message and a |
| 26 |
|
| 27 |
Modified: main/trunk/pym/_emerge/help.py |
| 28 |
=================================================================== |
| 29 |
--- main/trunk/pym/_emerge/help.py 2009-10-06 08:20:16 UTC (rev 14503) |
| 30 |
+++ main/trunk/pym/_emerge/help.py 2009-10-06 18:56:14 UTC (rev 14504) |
| 31 |
@@ -14,7 +14,7 @@ |
| 32 |
print(" "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >") |
| 33 |
print(" "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]") |
| 34 |
print(" "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("--verbose")+" ] ") |
| 35 |
- print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpqPsStuvV")+"]") |
| 36 |
+ print(bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhjkKlnNoOpPqrsStuvV")+"]") |
| 37 |
print(" [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]") |
| 38 |
print(" [ "+green("--complete-graph")+" ] [ "+green("--deep")+" ]") |
| 39 |
print(" [ "+green("--jobs") + " " + turquoise("JOBS")+" ] [ "+green("--keep-going")+" ] [ " + green("--load-average")+" " + turquoise("LOAD") + " ]") |
| 40 |
@@ -161,7 +161,7 @@ |
| 41 |
for line in wrap(desc, desc_width): |
| 42 |
print(desc_indent + line) |
| 43 |
print() |
| 44 |
- print(" "+green("--resume")) |
| 45 |
+ print(" "+green("--resume")+" ("+green("-r")+" short option)") |
| 46 |
print(" Resumes the most recent merge list that has been aborted due to an") |
| 47 |
print(" error. Please note that this operation will only return an error") |
| 48 |
print(" on failure. If there is nothing for portage to do, then portage") |
| 49 |
|
| 50 |
Modified: main/trunk/pym/_emerge/main.py |
| 51 |
=================================================================== |
| 52 |
--- main/trunk/pym/_emerge/main.py 2009-10-06 08:20:16 UTC (rev 14503) |
| 53 |
+++ main/trunk/pym/_emerge/main.py 2009-10-06 18:56:14 UTC (rev 14504) |
| 54 |
@@ -83,6 +83,7 @@ |
| 55 |
"o":"--onlydeps", "O":"--nodeps", |
| 56 |
"p":"--pretend", "P":"--prune", |
| 57 |
"q":"--quiet", |
| 58 |
+"r":"--resume", |
| 59 |
"s":"--search", "S":"--searchdesc", |
| 60 |
"t":"--tree", |
| 61 |
"u":"--update", |
Archives