From dfdf806fffede8afc112e1a6f1ff6130b9feb238 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Mon, 20 Mar 2006 18:05:19 +0000 Subject: Count correctly even when repackaging --- urpm.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/urpm.pm b/urpm.pm index 7cd0a631..b9262b0c 100644 --- a/urpm.pm +++ b/urpm.pm @@ -2908,9 +2908,14 @@ sub install_logger { $urpm->{logger_progress} = 0; if ($type eq 'trans') { $urpm->{logger_id} ||= 0; + $urpm->{logger_count} ||= 0; printf("%-28s", N("Preparing...")); } else { - printf "%9s: %-22s", (++$urpm->{logger_id}) . "/" . $total_pkg, ($pkg && $pkg->name); + ++$urpm->{logger_id}; + my $pname = $pkg ? $pkg->name : ''; + ++$urpm->{logger_count} if $pname; + $pname ||= N("[repackaging]"); + printf "%9s: %-22s", $urpm->{logger_count} . "/" . $total_pkg, $pname; } } elsif ($subtype eq 'stop') { if ($urpm->{logger_progress} < $progress_size) { -- cgit v1.2.1