From 274fe6a8db532fab2feabe4ce62ef7cf58bd1c76 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 4 Mar 2002 14:46:50 +0000
Subject: fixed interpretation of size of package when doing an install (this
 can be severe, need testing).

---
 perl-install/pkgs.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/pkgs.pm')

diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1398ad94f..3b8033e26 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -80,7 +80,7 @@ sub packageFile         { $_[0] && $_[0]->[$FILE] =~ /^([^:\s]*-[^:\-\s]+-[^:\-\
 			    : die "invalid file `" . ($_[0] && $_[0]->[$FILE]) . "'\n" . backtrace() }
 sub packageEpoch        { $_[0] && $_[0]->[$EPOCH] || 0 }
 
-sub packageSize   { to_int($_[0] && $_[0]->[$SIZE_DEPS]) }
+sub packageSize   { to_int($_[0] && ($_[0]->[$SIZE_DEPS] - ($_[0]->[$INSTALLED_CUMUL_SIZE] || 0))) }
 sub packageDepsId { split ' ', ($_[0] && ($_[0]->[$SIZE_DEPS] =~ /^\d*\s*(.*)/)[0]) }
 
 sub packageFlagSelected  { $_[0] && $_[0]->[$FLAGS] & $PKGS_SELECTED }
@@ -168,7 +168,7 @@ sub selectedSize {
     my ($packages) = @_;
     my $size = 0;
     foreach (values %{$packages->{names}}) {
-	packageFlagSelected($_) && !packageFlagInstalled($_) and $size += packageSize($_) - ($_->[$INSTALLED_CUMUL_SIZE] || 0);
+	packageFlagSelected($_) && !packageFlagInstalled($_) and $size += packageSize($_);
     }
     $size;
 }
-- 
cgit v1.2.1