diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-09-06 18:03:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-09-06 18:03:10 +0000 |
| commit | 1de94272a60220b2f5d4282420302181a707b2b3 (patch) | |
| tree | 29baa1d0abdf91552a43f60331ee7329a3039eb0 | |
| parent | 9e9d596fc5488cfd2956639814ae8bf857f0ff4d (diff) | |
| download | portage-1de94272a60220b2f5d4282420302181a707b2b3.tar.gz portage-1de94272a60220b2f5d4282420302181a707b2b3.tar.bz2 portage-1de94272a60220b2f5d4282420302181a707b2b3.zip | |
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. (trunk r7720)
svn path=/main/branches/2.1.2/; revision=7744
| -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" |