Make --noreplace take precedence over --newuse, as suggested by wolf31o2.

(trunk r9512:9514)

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

diff --git a/bin/emerge b/bin/emerge
index 3623ea2ea8eea07a0250c3e0d5ab2d8b68db489d..2140a02758f9cd6de87cf3cfbada7cac7f36ea86 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1635,6 +1635,7 @@ class depgraph:
                                        return 0
                                del e
 
+               noreplace = "--noreplace" in self.myopts
                reinstall_for_flags = None
                merging=1
                if mytype == "installed":
@@ -1648,7 +1649,7 @@ class depgraph:
                        """ If we aren't merging, perform the --newuse check.
                            If the package has new iuse flags or different use flags then if
                            --newuse is specified, we need to merge the package. """
-                       if merging == 0 and \
+                       if not noreplace and merging == 0 and \
                                myroot == self.target_root and \
                                ("--newuse" in self.myopts or
                                "--reinstall" in self.myopts) and \