For bug #144333, document the new --reinstall=changed-use option. (trunk r7081)

svn path=/main/branches/2.1.2/; revision=7082

diff --git a/man/emerge.1 b/man/emerge.1
index 1a4aea02036dfa1c7291e2517225506315729bcd..dd3cda1ae74f03d48f318571fa2db15ad70e3ca3 100644 (file)
--- 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/emergehelp.py b/pym/emergehelp.py
index 69c8453e9ee1ac4838a5b67d3165553fe9720244..fa7bf32ce93e48be6db619e5c0ebb528a8afdf4a 100644 (file)
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.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"