diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-07-08 21:41:01 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-07-08 21:41:01 +0000 |
commit | 90ab9855f680b5d863d3b2535212fa5ac8a322c3 (patch) | |
tree | 17658e64e98efa26cf19f411d5efba9cb4684656 | |
parent | 723dc66545ad29fd7b75260788009ca9a7610ab6 (diff) | |
download | portage-90ab9855f680b5d863d3b2535212fa5ac8a322c3.tar.gz portage-90ab9855f680b5d863d3b2535212fa5ac8a322c3.tar.bz2 portage-90ab9855f680b5d863d3b2535212fa5ac8a322c3.zip |
Document the --selective option.
svn path=/main/trunk/; revision=13807
-rw-r--r-- | man/emerge.1 | 4 | ||||
-rw-r--r-- | pym/_emerge/help.py | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index b533857bb..4cb0c7ff2 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -446,6 +446,10 @@ be enabled under normal circumstances. For currently supported \fBDEPEND\fR variable. However, behavior may change for new \fBEAPI\fRs when related extensions are added in the future. .TP +.BR "\-\-selective" +This is similar to the \fB\-\-noreplace\fR option, except that it +does not take precedence over options such as \fB\-\-newuse\fR. +.TP .BR "\-\-skipfirst" This option is only valid when used with \fB\-\-resume\fR. It removes the first package in the resume list. Dependencies are recalculated for diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index f78c2e0e0..583b57aa7 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -467,6 +467,12 @@ def help(myopts, havecolor=1): for line in wrap(desc, desc_width): print desc_indent + line print + print " " + green("--selective") + desc = "This is similar to the --noreplace option, except that it " + \ + "does not take precedence over options such as --newuse." + for line in wrap(desc, desc_width): + print desc_indent + line + print print " "+green("--skipfirst") desc = "This option is only valid when " + \ "used with --resume. It removes the " + \ |