Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/
Date: Sat, 30 Jun 2012 20:51:14
Message-Id: 1341089427.d44df83d9f00405a62b25439ddc1915e6366a300.zmedico@gentoo
1 commit: d44df83d9f00405a62b25439ddc1915e6366a300
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 30 20:50:01 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 30 20:50:27 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d44df83d
7
8 man/emerge.1: note that --resume re-uses options
9
10 ---
11 man/emerge.1 | 3 +++
12 1 files changed, 3 insertions(+), 0 deletions(-)
13
14 diff --git a/man/emerge.1 b/man/emerge.1
15 index 5d0c05d..b45e41b 100644
16 --- a/man/emerge.1
17 +++ b/man/emerge.1
18 @@ -202,6 +202,9 @@ generate and distribute cache for use by others, use \fBegencache\fR(1).
19 .TP
20 .BR "\-\-resume" (\fB\-r\fR)
21 Resumes the most recent merge list that has been aborted due to an error.
22 +This re\-uses the options that were given with the original
23 +command that's being resumed, and the user may also provide
24 +additional options when calling \fB\-\-resume\fR.
25 Please note that this operation will only return an error on failure. If there
26 is nothing for portage to do, then portage will exit with a message and a
27 success condition. A resume list will persist until it has been completed in