summaryrefslogtreecommitdiffstats
path: root/pym/_emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-06 00:36:04 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-06 00:36:04 +0000
commitd79d046ffe39504f0b67c90da083a241ce1a6946 (patch)
tree0e52e4d63402931d9983460fb66409150238f214 /pym/_emerge
parent7268523ce2f991a9007f6062121cca72781bb797 (diff)
downloadportage-d79d046ffe39504f0b67c90da083a241ce1a6946.tar.gz
portage-d79d046ffe39504f0b67c90da083a241ce1a6946.tar.bz2
portage-d79d046ffe39504f0b67c90da083a241ce1a6946.zip
For consistency with the merge list display, show "block" instead
of "blocker" in the summary. svn path=/main/trunk/; revision=10216
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 588972f42..d2ff9af75 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5347,7 +5347,7 @@ class PackageCounters(object):
myoutput.append(bad(" (%s unsatisfied)") % \
(self.restrict_fetch - self.restrict_fetch_satisfied))
if self.blocks > 0:
- myoutput.append("\nConflict: %s blocker" % \
+ myoutput.append("\nConflict: %s block" % \
self.blocks)
if self.blocks > 1:
myoutput.append("s")