From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 6 May 2008 00:36:24 +0000 (-0000)
Subject: For consistency with the merge list display, show "block" instead
X-Git-Tag: v2.1.5~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5684d3e20f42c76ffcfc72dbbf1ccc0b801a2ce8;p=portage.git

For consistency with the merge list display, show "block" instead
of "blocker" in the summary. (trunk r10216)

svn path=/main/branches/2.1.2/; revision=10217
---

diff --git a/bin/emerge b/bin/emerge
index e7d0d29f9..5f65719c9 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -5509,7 +5509,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")