diff options
| -rw-r--r-- | pym/portage.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index e39d2fb9d..28e54af7b 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -7808,7 +7808,6 @@ class dblink: 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: @@ -7821,12 +7820,18 @@ class dblink: #print green("*")+" spent "+str(time.time()-starttime)+" seconds checking for file collisions" 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 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" |