From 79e4f4d568220002b9e1e97a0f69d7849e1ab73c Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Tue, 30 Nov 2004 00:31:57 +0000
Subject: Must stop fixing bugs that late.

---
 urpm.pm | 4 +---
 urpmi   | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/urpm.pm b/urpm.pm
index 06b2942d..52cd7a03 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2728,7 +2728,7 @@ sub extract_packages_to_install {
 sub install_logger {
     my ($urpm, $type, $id, $subtype, $amount, $total) = @_;
     my $pkg = defined $id && $urpm->{depslist}[$id];
-    my $total_pkg = $urpm->{nb_install} + $urpm->{nb_upgrade};
+    my $total_pkg = $urpm->{nb_install};
     my $progress_size = $total_pkg ? 45 : 50;
 
     if ($subtype eq 'start') {
@@ -2856,8 +2856,6 @@ sub install {
 	    } $pkg->files;
 	    close $fh;
 	};
-	$urpm->{nb_install} += scalar keys %$install;
-	$urpm->{nb_upgrade} += scalar keys %$upgrade;
 	if (scalar keys %$install || scalar keys %$upgrade) {
 	    $options{callback_inst}  ||= \&install_logger;
 	    $options{callback_trans} ||= \&install_logger;
diff --git a/urpmi b/urpmi
index 2e85d6d9..fb86942b 100755
--- a/urpmi
+++ b/urpmi
@@ -533,6 +533,7 @@ foreach my $pkg (sort { $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$sta
 	push @to_install, $fullname;
     }
 }
+$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))
-- 
cgit v1.2.1