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 e7d0d29f9ced7f436b5bc36b25a79c4e92945198..5f65719c91c5f7c02bd81123e5d76421fd27ba53 100755 (executable)
--- 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")