From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Aug 2007 22:03:50 +0000 (-0000)
Subject: Reformat collision-protect output so that the list of file collisions is shown below... 
X-Git-Tag: v2.2_pre1~833
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0f9ecedb2f9192e512110e32476d0d97891275b;p=portage.git

Reformat collision-protect output so that the list of file collisions is shown below the banner. This puts more distance between the collision list and the list of files that prepstrip often displays just above, hopefully preventing user confusion about which files had collisions.

svn path=/main/trunk/; revision=7720
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d112c84e8..5ff8e1e33 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1498,7 +1498,6 @@ class dblink(object):
 						break
 				if not isowned:
 					collisions.append(f)
-					print "existing file "+f+" is not owned by this package"
 					stopmerge = True
 					if collision_ignore:
 						if f in collision_ignore:
@@ -1510,12 +1509,18 @@ class dblink(object):
 									break
 			if stopmerge:
 				print red("*")+" This package is blocked because it wants to overwrite"
-				print red("*")+" files belonging to other packages (see messages above)."
+				print red("*")+" files belonging to other packages (see list below)."
 				print red("*")+" If you have no clue what this is all about report it "
 				print red("*")+" as a bug for this package on http://bugs.gentoo.org"
 				print
 				print red("package "+self.cat+"/"+self.pkg+" NOT merged")
 				print
+				print "Detected file collision(s):"
+				print
+				from portage.output import colorize
+				for f in collisions:
+					print "     '%s'" % colorize("INFORM",
+						os.path.join(destroot, f.lstrip(os.path.sep)))
 				print
 				print "Searching all installed packages for file collisions..."
 				print "Press Ctrl-C to Stop"