summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-06-28 09:31:37 +0000
committerZac Medico <zmedico@gentoo.org>2007-06-28 09:31:37 +0000
commit4317d03fbf34d87d7b15acc3e88cf970a9974b06 (patch)
tree02fa37187df4948514b44e5dccb4fbee02d043e7
parentaf314c87fbdc2102da6ca003908b7492fe4a8b63 (diff)
downloadportage-4317d03fbf34d87d7b15acc3e88cf970a9974b06.tar.gz
portage-4317d03fbf34d87d7b15acc3e88cf970a9974b06.tar.bz2
portage-4317d03fbf34d87d7b15acc3e88cf970a9974b06.zip
For bug #144333, document the new --reinstall=changed-use option.
svn path=/main/trunk/; revision=7081
-rw-r--r--man/emerge.16
-rw-r--r--pym/emerge/help.py8
2 files changed, 13 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 1a4aea020..dd3cda1ae 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -355,6 +355,12 @@ the printout:
Results may vary, but the general outcome is a reduced or condensed
output from portage's displays.
.TP
+.BR "\-\-reinstall changed\-use"
+Tells emerge to include installed packages where USE flags have
+changed since installation. Unlike \fB\-\-newuse\fR, this option does
+not trigger reinstallation when flags that the user has not
+enabled are added or removed.
+.TP
.BR "\-\-skipfirst"
This option is only valid when used with \fB\-\-resume\fR. It removes the
first package in the resume list so that a merge may continue in the presence
diff --git a/pym/emerge/help.py b/pym/emerge/help.py
index 44dea9709..7502d423d 100644
--- a/pym/emerge/help.py
+++ b/pym/emerge/help.py
@@ -16,7 +16,7 @@ def shorthelp():
print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("--sync")+" ] "
print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
print " [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--columns")+" ]"
- print " ["+green("--nospinner")+"]"
+ print " [ "+green("--reinstall ")+turquoise("changed-use")+" ] ["+green("--nospinner")+"]"
print " [ "+green("--deep")+" ] [" + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]"
print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
@@ -293,6 +293,12 @@ def help(myaction,myopts,havecolor=1):
print " Effects vary, but the general outcome is a reduced or condensed"
print " output from portage's displays."
print
+ print " "+green("--reinstall ") + turquoise("changed-use")
+ print " Tells emerge to include installed packages where USE flags have"
+ print " changed since installation. Unlike --newuse, this option does"
+ print " not trigger reinstallation when flags that the user has not"
+ print " enabled are added or removed."
+ print
print " "+green("--skipfirst")
print " This option is only valid in a resume situation. It removes the"
print " first package in the resume list so that a merge may continue in"