| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-06 00:36:24 +0000 (Tue, 06 May 2008) |
| 3 |
New Revision: 10217 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
For consistency with the merge list display, show "block" instead |
| 9 |
of "blocker" in the summary. (trunk r10216) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-06 00:36:04 UTC (rev 10216) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-06 00:36:24 UTC (rev 10217) |
| 16 |
@@ -5509,7 +5509,7 @@ |
| 17 |
myoutput.append(bad(" (%s unsatisfied)") % \ |
| 18 |
(self.restrict_fetch - self.restrict_fetch_satisfied)) |
| 19 |
if self.blocks > 0: |
| 20 |
- myoutput.append("\nConflict: %s blocker" % \ |
| 21 |
+ myoutput.append("\nConflict: %s block" % \ |
| 22 |
self.blocks) |
| 23 |
if self.blocks > 1: |
| 24 |
myoutput.append("s") |
| 25 |
|
| 26 |
-- |
| 27 |
gentoo-commits@l.g.o mailing list |
Archives