From c3a3eb8f1326af1b43623d963359b8d115e1e8ab Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Fri, 9 Jul 2004 09:28:20 +0000 Subject: More grammarworthy information messages (or, don't say "1 packages") --- urpmi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/urpmi b/urpmi index 4dddb535..bea2338c 100755 --- a/urpmi +++ b/urpmi @@ -501,7 +501,9 @@ foreach my $pkg (sort { $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$sta } } if ($env) { - my $msg = N("To satisfy dependencies, the following %d packages are going to be installed (%d MB)", $#to_install+1, toMb($sum)); + my $msg = $#to_install + ? N("To satisfy dependencies, the following %d packages are going to be installed (%d MB)", $#to_install+1, toMb($sum)) + : N("To satisfy dependencies, the following package is going to be installed (%d MB)", toMb($sum)); my $p = join "\n", @to_install; print STDERR "$msg:\n$p\n"; exit 0; #- exit now for specific environment. @@ -510,7 +512,9 @@ if (@root_only) { print STDERR N("You need to be root to install the following dependencies:\n%s\n", join ' ', @root_only); exit 1; } elsif (!$urpm->{options}{auto} && ($ask_user || $urpm::args::options{X}) && @to_install) { - my $msg = N("To satisfy dependencies, the following %d packages are going to be installed (%d MB)", $#to_install+1, toMb($sum)); + my $msg = $#to_install + ? N("To satisfy dependencies, the following %d packages are going to be installed (%d MB)", $#to_install+1, toMb($sum)) + : N("To satisfy dependencies, the following package is going to be installed (%d MB)", toMb($sum)); my $msg2 = N("Is this OK?"); my $p = join "\n", @to_install; if ($urpm::args::options{X}) { -- cgit v1.2.1