In the file collision elog message, only say 'NOT merged' when

collision-protect is enabled. Thanks to dberkholz for reporting.

svn path=/main/trunk/; revision=11316

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ef5da58412c037b71b889e136e688ed7bcea97c1..c8babe5463693aab99c2a68eaae38396cac4d1c6 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2684,10 +2684,14 @@ class dblink(object):
                        # it may not be visible via a scrollback buffer, especially
                        # if the number of file collisions is large. Therefore,
                        # show a summary at the end.
-                       msg = ("Package '%s' NOT merged due to " + \
-                               "file collisions. If necessary, refer to your elog " + \
-                               "messages for the whole content of the above message.") % \
-                               self.settings.mycpv
+                       if collision_protect:
+                               msg = "Package '%s' NOT merged due to file collisions." % \
+                                       self.settings.mycpv
+                       else:
+                               msg = "Package '%s' merged despite file collisions." % \
+                                       self.settings.mycpv
+                       msg += " If necessary, refer to your elog " + \
+                               "messages for the whole content of the above message."
                        eerror(wrap(msg, 70))
 
                        if collision_protect: