diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-25 23:33:02 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-25 23:33:02 +0000 |
commit | 285f69ceacfcd35e6fed52e5b59e163aeaac4fb7 (patch) | |
tree | 602c27d55a8e852f3050d1e1ad451f8768934411 | |
parent | 10e1f8ca3374fdbfc089b107bedf72b7bdb14d19 (diff) | |
download | urpmi-285f69ceacfcd35e6fed52e5b59e163aeaac4fb7.tar urpmi-285f69ceacfcd35e6fed52e5b59e163aeaac4fb7.tar.gz urpmi-285f69ceacfcd35e6fed52e5b59e163aeaac4fb7.tar.bz2 urpmi-285f69ceacfcd35e6fed52e5b59e163aeaac4fb7.tar.xz urpmi-285f69ceacfcd35e6fed52e5b59e163aeaac4fb7.zip |
- urpmi:
o display "%s of packages will be retrieved."
(need perl-URPM 3.10 and synthesis built with @filesize@)
-rw-r--r-- | NEWS | 2 | ||||
-rwxr-xr-x | urpmi | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -11,6 +11,8 @@ download dir to cachedir) o handle variables $ARCH/$RELEASE in mirrorlist - urpmi: + o display "%s of packages will be retrieved." + (need perl-URPM 3.10 and synthesis built with @filesize@) o do not say "files are missing" when the downloaded rpm is corrupted o --test: only display "Installation is possible" when it is the case (#29837) o fix "using one big transaction" that occurs when using --keep @@ -595,16 +595,17 @@ if (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install} || $env && !$opt if ($test) { $msg = "$msg\n" . N("(test only, installation will not be actually done)"); } - my $size = $urpm->selected_size($state); + my ($size, $filesize) = $urpm->selected_size_filesize($state); my @to_install_formatted = urpm::msg::format_line_selected_packages($urpm, $state, \@to_install); my $msg2 = $size >= 0 ? N("%s of additional disk space will be used.", formatXiB($size)) : N("%s of disk space will be freed.", formatXiB(-$size)); + my $msg2_ = $filesize ? N("%s of packages will be retrieved.", formatXiB($filesize)) . "\n" : ''; my $msg3 = P("Proceed with the installation of one package?", "Proceed with the installation of the %d packages?", $urpm->{nb_install}, $urpm->{nb_install}); - my $p = join("\n", $msg, @to_install_formatted, $msg2, $msg3); + my $p = join("\n", $msg, @to_install_formatted, $msg2, $msg2_ . $msg3); if ($env && !$options{debug__do_not_install}) { print "$p\n"; exit 0; #- exit now for specific environment. |