summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-07 07:37:26 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-07 07:37:26 +0000
commitce68cebc63f0bcfc2c4165c981c57b46aa7f4408 (patch)
treeb8abbd507a79e9f3bff7c624f9e521041636657d /bin/emerge
parent5d11f1dfc7f6cf54b1fea68a8ee5f402e2cfe6f2 (diff)
downloadportage-ce68cebc63f0bcfc2c4165c981c57b46aa7f4408.tar.gz
portage-ce68cebc63f0bcfc2c4165c981c57b46aa7f4408.tar.bz2
portage-ce68cebc63f0bcfc2c4165c981c57b46aa7f4408.zip
Thanks to Bo Ørsted Andresen <bo.andresen@zlin.dk> for this output fix for bug #153847.
svn path=/main/trunk/; revision=4974
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge9
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index 58a39a5b6..7b77d337a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2238,9 +2238,10 @@ class PackageCounters(object):
myoutput = []
details = []
myoutput.append("Total: %s package" % total_installs)
- if total_installs > 1:
+ if total_installs != 1:
myoutput.append("s")
- myoutput.append(" (")
+ if total_installs != 0:
+ myoutput.append(" (")
if self.upgrades > 0:
details.append("%s upgrade" % self.upgrades)
if self.upgrades > 1:
@@ -2264,7 +2265,9 @@ class PackageCounters(object):
if self.blocks > 1:
details[-1] += "s"
myoutput.append(", ".join(details))
- myoutput.append("), Size of downloads: %s" % format_size(self.totalsize))
+ if total_installs != 0:
+ myoutput.append(")")
+ myoutput.append(", Size of downloads: %s" % format_size(self.totalsize))
return "".join(myoutput)
class MergeTask(object):