summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-11-17 16:34:29 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-11-17 16:34:29 +0000
commite8cc409ffe18cc048dd4c0702894ffbce6f5a697 (patch)
tree4859959cf67f1770b82005f6902be44594865724
parent962cd2079851ffd640c676e82c7bacca34f5885b (diff)
downloadurpmi-e8cc409ffe18cc048dd4c0702894ffbce6f5a697.tar
urpmi-e8cc409ffe18cc048dd4c0702894ffbce6f5a697.tar.gz
urpmi-e8cc409ffe18cc048dd4c0702894ffbce6f5a697.tar.bz2
urpmi-e8cc409ffe18cc048dd4c0702894ffbce6f5a697.tar.xz
urpmi-e8cc409ffe18cc048dd4c0702894ffbce6f5a697.zip
Move summary of number of packages / size installed at the end, for better
visibility (bug #19818)
-rwxr-xr-xurpmi13
1 files changed, 7 insertions, 6 deletions
diff --git a/urpmi b/urpmi
index 12d0f943..5ee6048a 100755
--- a/urpmi
+++ b/urpmi
@@ -484,10 +484,11 @@ foreach my $pkg (sort { $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$sta
$urpm->{nb_install} = @to_install;
if ($env) {
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));
+ ? N("To satisfy dependencies, the following packages are going to be installed")
+ : N("To satisfy dependencies, the following package is going to be installed");
+ my $msg2 = N("(%d packages, %d MB)", $urpm->{nb_install}, toMb($sum));
my $p = join "\n", @to_install;
- print STDERR "$msg:\n$p\n";
+ print STDERR "$msg:\n$p\n$msg2\n";
exit 0; #- exit now for specific environment.
}
if (@root_only) {
@@ -495,9 +496,9 @@ if (@root_only) {
exit 1;
} elsif (!$urpm->{options}{auto} && $ask_user && @to_install) {
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?");
+ ? N("To satisfy dependencies, the following packages are going to be installed")
+ : N("To satisfy dependencies, the following package is going to be installed");
+ my $msg2 = N("Is this OK? (%d packages, %d MB)", $urpm->{nb_install}, toMb($sum));
my $p = join "\n", @to_install;
my $noexpr = N("Nn");
my $yesexpr = N("Yy");