Bug #262012 - Only trigger the slot conflict message about --newuse when

the installed version is the same as the new one. If they are different
versions then there's some other problem. (trunk r13059)

svn path=/main/branches/2.1.6/; revision=13073

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index efbd2afd5818c7bc1853ac0a744aafbca12d3ff6..878812b9a42ca270534021e4046ceeb142197057 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4849,7 +4849,11 @@ class depgraph(object):
                        # This shouldn't happen.
                        return None
 
-               if unmatched_node.installed and not matched_node.installed:
+               if unmatched_node.installed and not matched_node.installed and \
+                       unmatched_node.cpv == matched_node.cpv:
+                       # If the conflicting packages are the same version then
+                       # --newuse should be all that's needed. If they are different
+                       # versions then there's some other problem.
                        return "New USE are correctly set, but --newuse wasn't" + \
                                " requested, so an installed package with incorrect USE " + \
                                "happened to get pulled into the dependency graph. " + \