diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-26 07:22:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-26 07:22:06 +0000 |
| commit | 5a442f6d4cc5ad074e765ce8ddc0ef52d8b1314c (patch) | |
| tree | f5bfe5e1691efa2853319be7b90ec52be1d1aa8b | |
| parent | 12db02c2d286057968a37159da7e6f651a53de6a (diff) | |
| download | portage-5a442f6d4cc5ad074e765ce8ddc0ef52d8b1314c.tar.gz portage-5a442f6d4cc5ad074e765ce8ddc0ef52d8b1314c.tar.bz2 portage-5a442f6d4cc5ad074e765ce8ddc0ef52d8b1314c.zip | |
Bug #228085 - In the event of a file collision, the explanation about the
collision and how to solve 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 and refer the user to the elog messages.
svn path=/main/trunk/; revision=11196
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 251f62231..61d08f83c 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2655,10 +2655,23 @@ class dblink(object): for f in sorted(owned_files): msg.append("\t%s" % os.path.join(destroot, f.lstrip(os.path.sep))) + msg.append("") eerror(msg) + if not owners: eerror(["None of the installed" + \ - " packages claim the file(s)."]) + " packages claim the file(s).", ""]) + + # The explanation about the collision and how to solve + # 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 + eerror(wrap(msg, 70)) + if collision_protect: return 1 |