From d3e5064517757899a4e700cf27bf0226f4f496d0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 9 Aug 2007 14:59:16 +0000 Subject: we already computed the number of package (cosmetic) --- urpmi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'urpmi') diff --git a/urpmi b/urpmi index 5b56ee5b..22d6d920 100755 --- a/urpmi +++ b/urpmi @@ -580,7 +580,7 @@ foreach my $pkg (sort { $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$sta } $urpm->{nb_install} = @to_install; if ($env) { - my $msg = @to_install == 1 ? N("To satisfy dependencies, the following package is going to be installed:") + my $msg = $urpm->{nb_install} == 1 ? N("To satisfy dependencies, the following package is going to be installed:") : N("To satisfy dependencies, the following packages are going to be installed:"); my $msg2 = P("(%d package, %d MB)", "(%d packages, %d MB)", $urpm->{nb_install}, $urpm->{nb_install}, toMb($sum)); my $p = join "\n", @to_install; @@ -590,8 +590,8 @@ if ($env) { if (@root_only) { print 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 && @to_install) { - my $msg = @to_install == 1 ? N("To satisfy dependencies, the following package is going to be installed:") +} elsif (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install}) { + my $msg = $urpm->{nb_install} == 1 ? N("To satisfy dependencies, the following package is going to be installed:") : N("To satisfy dependencies, the following packages are going to be installed:"); if ($test) { $msg = "$msg\n" . N("(test only, installation will not be actually done)"); -- cgit v1.2.1