From d79d046ffe39504f0b67c90da083a241ce1a6946 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 6 May 2008 00:36:04 +0000 Subject: For consistency with the merge list display, show "block" instead of "blocker" in the summary. svn path=/main/trunk/; revision=10216 --- pym/_emerge/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym') 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") -- cgit v1.2.3-1-g7c22