diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-06 00:36:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-06 00:36:24 +0000 |
| commit | 5684d3e20f42c76ffcfc72dbbf1ccc0b801a2ce8 (patch) | |
| tree | 6807f7f27153d654be88296e89f232f6d717fb7e /bin | |
| parent | d7e00208d4e4957c3cc4ae443b14b9cdf27a4e0d (diff) | |
| download | portage-5684d3e20f42c76ffcfc72dbbf1ccc0b801a2ce8.tar.gz portage-5684d3e20f42c76ffcfc72dbbf1ccc0b801a2ce8.tar.bz2 portage-5684d3e20f42c76ffcfc72dbbf1ccc0b801a2ce8.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 2 |
1 files changed, 1 insertions, 1 deletions
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") |