From: Fabian Groffen Date: Sat, 1 Sep 2007 14:55:12 +0000 (-0000) Subject: Merged from trunk 7719:7720 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4b00748c39427b61dec26dbe462c12e537d220c2;p=portage.git Merged from trunk 7719:7720 | 7720 | Reformat collision-protect output so that the list of file | | zmedico | 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/branches/prefix/; revision=7722 --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index b9f205a7a..855b2b5b8 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"