From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 2 Aug 2008 00:32:51 +0000 (-0000)
Subject: In the file collision elog message, only say 'NOT merged' when
X-Git-Tag: v2.2_rc7~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81d742d9b63b8a6305482d78c01274be69db5c3f;p=portage.git

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 ef5da5841..c8babe546 100644
--- 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: