1 |
Author: zmedico |
2 |
Date: 2008-05-06 00:36:04 +0000 (Tue, 06 May 2008) |
3 |
New Revision: 10216 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
For consistency with the merge list display, show "block" instead |
9 |
of "blocker" in the summary. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-06 00:16:31 UTC (rev 10215) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-06 00:36:04 UTC (rev 10216) |
16 |
@@ -5347,7 +5347,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 |