diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-02 00:32:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-02 00:32:51 +0000 |
| commit | 81d742d9b63b8a6305482d78c01274be69db5c3f (patch) | |
| tree | 61492c1a74bfcb170b1aefdd23f54afda2d4f658 | |
| parent | 705ef026a8ffd0528de58ac4da7889022bee9741 (diff) | |
| download | portage-81d742d9b63b8a6305482d78c01274be69db5c3f.tar.gz portage-81d742d9b63b8a6305482d78c01274be69db5c3f.tar.bz2 portage-81d742d9b63b8a6305482d78c01274be69db5c3f.zip | |
In the file collision elog message, only say 'NOT merged' when
collision-protect is enabled. Thanks to dberkholz for reporting.
svn path=/main/trunk/; revision=11316
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index ef5da5841..c8babe546 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2684,10 +2684,14 @@ class dblink(object): # 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 + if collision_protect: + msg = "Package '%s' NOT merged due to file collisions." % \ + self.settings.mycpv + else: + msg = "Package '%s' merged despite file collisions." % \ + self.settings.mycpv + msg += " If necessary, refer to your elog " + \ + "messages for the whole content of the above message." eerror(wrap(msg, 70)) if collision_protect: |