diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-09 12:53:52 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-09 12:53:52 +0000 |
| commit | eaab7cc1260043e18b6697756a19d7331055f589 (patch) | |
| tree | 064209a70a288e1a06ec4d2775b511ca3cf79757 | |
| parent | 164e94e201e9d49ab9464fc737dfcfbc43f6e596 (diff) | |
| download | drakx-backup-do-not-use-eaab7cc1260043e18b6697756a19d7331055f589.tar drakx-backup-do-not-use-eaab7cc1260043e18b6697756a19d7331055f589.tar.gz drakx-backup-do-not-use-eaab7cc1260043e18b6697756a19d7331055f589.tar.bz2 drakx-backup-do-not-use-eaab7cc1260043e18b6697756a19d7331055f589.tar.xz drakx-backup-do-not-use-eaab7cc1260043e18b6697756a19d7331055f589.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 6 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index c48a5b982..4af5df6da 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -453,14 +453,10 @@ sub choosePackagesTree { }; my $update_size = sub { - my $size = 0; - foreach (values %{$packages->[0]}) { - $size += pkgs::packageSize($_) - ($_->{installedCumulSize} || 0) if pkgs::packageFlagSelected($_); #- on upgrade, installed packages will be removed. - } + my $size = pkgs::selectedSize(); $w_size->set(_("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), install_any::getAvailableSpace($o) / sqr(1024))); - }; my $toggle = sub { if (ref $curr) { diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index f591e9bbb..9c745a1f2 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -177,7 +177,11 @@ sub invCorrectSize { min($_[0], (sqrt(sqr($B) + 4 * $A * ($_[0] - $C)) - $B) / 2 sub selectedSize { my ($packages) = @_; - int (sum map { packageSize($_) - ($_->{installedCumulSize} || 0) } grep { packageFlagSelected($_) } values %{$packages->[0]}); + my $size = 0; + foreach (values %{$packages->[0]}) { + packageFlagSelected($_) && !packageFlagInstalled($_) and $size += packageSize($_) - ($_->{installedCumulSize} || 0); + } + $size; } sub correctedSelectedSize { correctSize(selectedSize($_[0]) / sqr(1024)) } |