diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-06 05:25:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-06 05:25:06 +0000 |
| commit | 183281fb9ebbce1adfc022a4b627ebc61e17eb0d (patch) | |
| tree | 7ef2e035f6c788afafc149765d6307bfbea21408 | |
| parent | 466cfb920412a47c1bf8e47628dd59f90a7220b2 (diff) | |
| download | portage-183281fb9ebbce1adfc022a4b627ebc61e17eb0d.tar.gz portage-183281fb9ebbce1adfc022a4b627ebc61e17eb0d.tar.bz2 portage-183281fb9ebbce1adfc022a4b627ebc61e17eb0d.zip | |
For bug #156536, update --resume docs to show that the resume history is capable of storing two merge lists.
svn path=/main/trunk/; revision=6742
| -rw-r--r-- | man/emerge.1 | 10 | ||||
| -rw-r--r-- | pym/emerge/help.py | 13 |
2 files changed, 16 insertions, 7 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index aaed8651f..1a4aea020 100644 --- 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/emerge/help.py b/pym/emerge/help.py index 7df9ee760..44dea9709 100644 --- a/pym/emerge/help.py +++ b/pym/emerge/help.py @@ -100,10 +100,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" |