| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-02 00:32:51 +0000 (Sat, 02 Aug 2008) |
| 3 |
New Revision: 11316 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
In the file collision elog message, only say 'NOT merged' when |
| 9 |
collision-protect is enabled. Thanks to dberkholz for reporting. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-08-01 22:22:29 UTC (rev 11315) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-08-02 00:32:51 UTC (rev 11316) |
| 16 |
@@ -2684,10 +2684,14 @@ |
| 17 |
# it may not be visible via a scrollback buffer, especially |
| 18 |
# if the number of file collisions is large. Therefore, |
| 19 |
# show a summary at the end. |
| 20 |
- msg = ("Package '%s' NOT merged due to " + \ |
| 21 |
- "file collisions. If necessary, refer to your elog " + \ |
| 22 |
- "messages for the whole content of the above message.") % \ |
| 23 |
- self.settings.mycpv |
| 24 |
+ if collision_protect: |
| 25 |
+ msg = "Package '%s' NOT merged due to file collisions." % \ |
| 26 |
+ self.settings.mycpv |
| 27 |
+ else: |
| 28 |
+ msg = "Package '%s' merged despite file collisions." % \ |
| 29 |
+ self.settings.mycpv |
| 30 |
+ msg += " If necessary, refer to your elog " + \ |
| 31 |
+ "messages for the whole content of the above message." |
| 32 |
eerror(wrap(msg, 70)) |
| 33 |
|
| 34 |
if collision_protect: |
Archives