From db03b9af4f0658271f3841eb3273f1447a4f46a9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 31 Aug 2012 16:45:26 +0000
Subject: (do_install_3,sync_logger) make it obvious that parameters do be used

---
 gurpmi2          | 5 +++--
 urpm/download.pm | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gurpmi2 b/gurpmi2
index b3474d30..ca1cee5c 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -348,13 +348,14 @@ sub do_install_3 () {
             1;
         },
         trans_log => sub {
-	    my ($mode, $file, $percent, $_total, $_eta, $_speed) = @_;
+	    my ($mode, $file, $percent, $total, $eta, $speed) = @_;
 
             urpm::download::sync_logger(@_);
 
             if (member($mode, 'start', 'progress')) {
 		$file =~ s|/*\s*$||; $file =~ s|.*/||;
-                $progress_label->set_label(N("Downloading package `%s'...", $file) . "\n" . &urpm::download::progress_text);
+                $progress_label->set_label(N("Downloading package `%s'...", $file) . "\n" .
+                                             &urpm::download::progress_text($mode, $file, $percent, $total, $eta, $speed));
 	    }
             if ($mode eq 'start') {
 		$download_nb++;
diff --git a/urpm/download.pm b/urpm/download.pm
index f56928c6..62a9c5ac 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -843,11 +843,11 @@ Default logger (callback) suitable for sync operation on STDERR only.
 =cut
 
 sub sync_logger {
-    my ($mode, $file, $percent, $_total, $_eta, $_speed) = @_;
+    my ($mode, $file, $percent, $total, $eta, $speed) = @_;
     if ($mode eq 'start') {
 	print STDERR "    $file\n";
     } elsif ($mode eq 'progress') {
-	my $text = &progress_text;
+	my $text = progress_text($mode, $file, $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
-- 
cgit v1.2.1