For bug #156536, update --resume docs to show that the resume history is capable...

svn path=/main/branches/2.1.2/; revision=6762

diff --git a/man/emerge.1 b/man/emerge.1
index aaed8651f6b6908193814a9c43304e5e56673c86..1a4aea02036dfa1c7291e2517225506315729bcd 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -144,9 +144,13 @@ the cache.  After a portage update, rsync users may find it convenient to run
 a sync operation.
 .TP
 .BR "\-\-resume"
-Resumes the last merge operation.  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 success condition.
+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
+success condition. A resume list will persist until it has been completed in
+entirety or until another aborted merge list replaces it.  The resume history
+is capable of storing two merge lists.  After one resume list completes, it is
+possible to invoke \-\-resume once again in order to resume an older list.
 .TP
 .BR "\-\-search " (\fB\-s\fR)
 Searches for matches of the supplied string in the portage tree.

diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 373e0bf444e40ae33604b8aede53460cc01feb22..cc2dc0bbbf9aa579f6d02ab050e81dc090bb355a 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -103,10 +103,15 @@ def help(myaction,myopts,havecolor=1):
                print "              Rsync users should simply 'emerge --sync' to regenerate."
                print
                print "       "+green("--resume")
-               print "              Resumes the last merge operation. It can be treated just like a"
-               print "              regular emerge: --pretend and other options work alongside it."
-               print "              'emerge --resume' only returns an error on failure. When there is"
-               print "              nothing to do, it exits with a message and a success condition."
+               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"
+               print "              will exit with a message and a success condition. A resume list"
+               print "              will persist until it has been completed in entirety or until"
+               print "              another aborted merge list replaces it. The resume history is"
+               print "              capable of storing two merge lists. After one resume list"
+               print "              completes, it is possible to invoke --resume once again in order"
+               print "              to resume an older list."
                print
                print "       "+green("--search")+" ("+green("-s")+" short option)"
                print "              Searches for matches of the supplied string in the current local"