From a96200f3d908429f50893339490b08306e9249de Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 8 Jun 2007 19:57:23 +0000 Subject: For bug #156536, update --resume docs to show that the resume history is capable of storing two merge lists. (trunk r6742) svn path=/main/branches/2.1.2/; revision=6762 --- pym/emergehelp.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'pym/emergehelp.py') diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 373e0bf44..cc2dc0bbb 100644 --- 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" -- cgit v1.2.3-1-g7c22