diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-08-31 16:45:31 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-08-31 16:45:31 +0000 |
commit | 3bfac162fb8f3d65ac51fdad5838b17364175ea6 (patch) | |
tree | 74340a6aa9f7032f71e11f9d21be379f754c34aa | |
parent | 06cb3b42adb73d74687e6acc49490a474142f44a (diff) | |
download | urpmi-3bfac162fb8f3d65ac51fdad5838b17364175ea6.tar urpmi-3bfac162fb8f3d65ac51fdad5838b17364175ea6.tar.gz urpmi-3bfac162fb8f3d65ac51fdad5838b17364175ea6.tar.bz2 urpmi-3bfac162fb8f3d65ac51fdad5838b17364175ea6.tar.xz urpmi-3bfac162fb8f3d65ac51fdad5838b17364175ea6.zip |
(progress_text) kill unused parameter
-rwxr-xr-x | gurpmi2 | 2 | ||||
-rw-r--r-- | urpm/download.pm | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -356,7 +356,7 @@ sub do_install_3 () { if (member($mode, 'start', 'progress')) { $file =~ s|/*\s*$||; $file =~ s|.*/||; $progress_label->set_label(N("Downloading package `%s'...", $file) . "\n" . - &urpm::download::progress_text($mode, $file, $percent, $total, $eta, $speed)); + &urpm::download::progress_text($mode, $percent, $total, $eta, $speed)); } if ($mode eq 'start') { $download_nb++; diff --git a/urpm/download.pm b/urpm/download.pm index 62a9c5ac..d13f844a 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -829,7 +829,7 @@ eval { }; sub progress_text { - my ($mode, $_file, $percent, $total, $eta, $speed) = @_; + my ($mode, $percent, $total, $eta, $speed) = @_; $mode eq 'progress' ? (defined $total && defined $eta ? N(" %s%% of %s completed, ETA = %s, speed = %s", $percent, $total, $eta, $speed) : @@ -847,7 +847,7 @@ sub sync_logger { if ($mode eq 'start') { print STDERR " $file\n"; } elsif ($mode eq 'progress') { - my $text = progress_text($mode, $file, $percent, $total, $eta, $speed); + my $text = progress_text($mode, $percent, $total, $eta, $speed); if (length($text) > $wchar) { $text = substr($text, 0, $wchar) } if (bytes::length($text) < $wchar) { # clearing more than needed in case the terminal is not handling utf8 and we have a utf8 string |