Merged from trunk 7080:7083

   +------------------------------------------------------------------------+
   | 7081    | For bug #144333, document the new --reinstall=changed-use    |
   | zmedico | option.                                                      |
   |---------+--------------------------------------------------------------|
   | 7083    | Fix typo.                                                    |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=7085

diff --git a/man/emerge.1 b/man/emerge.1
index 39e5669e892f8146e38798dd3e28ffdb8285e19c..25041de5002f7859cc983b4afe11ae12222c62ee 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/emerge/__init__.py b/pym/emerge/__init__.py
index 0495c3a41cc28ec5593cf19bab60e929aa645e96..526737ca61e562b4aa34e1ddbd751f75ea199aa8 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1048,16 +1048,16 @@ class depgraph(object):
                f.writer.flush()
 
        def _reinstall_for_flags(self, forced_flags,
-               orig_use, org_iuse, cur_use, cur_iuse):
+               orig_use, orig_iuse, cur_use, cur_iuse):
                if "--newuse" in self.myopts:
-                       if org_iuse.symmetric_difference(
+                       if orig_iuse.symmetric_difference(
                                cur_iuse).difference(forced_flags):
                                return True
-                       elif org_iuse.intersection(orig_use) != \
+                       elif orig_iuse.intersection(orig_use) != \
                                cur_iuse.intersection(cur_use):
                                return True
                elif "changed-use" == self.myopts.get("--reinstall"):
-                       if org_iuse.intersection(orig_use) != \
+                       if orig_iuse.intersection(orig_use) != \
                                cur_iuse.intersection(cur_use):
                                return True
                return False

diff --git a/pym/emerge/help.py b/pym/emerge/help.py
index 44dea9709dd7373226fa18fb4207b5a796128395..7502d423d6630ec717b7a6ca5962645f98177f78 100644 (file)
--- 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"