For consistency with the merge list display, show "block" instead
authorZac Medico <zmedico@gentoo.org>
Tue, 6 May 2008 00:36:04 +0000 (00:36 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 6 May 2008 00:36:04 +0000 (00:36 -0000)
of "blocker" in the summary.

svn path=/main/trunk/; revision=10216

pym/_emerge/__init__.py

index 588972f42bc776d1d333939f700be5a5a08bdebe..d2ff9af75fbb01b947650006ea2fb66e30bdb5b6 100644 (file)
@@ -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")