summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-03 17:30:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-03 17:30:17 +0000
commit9680a74c3cb9605cc8b5235fc7e82af5f48117e6 (patch)
tree3fdd619690c8a7dae5a209867e18b90bb9156d1a /perl-install/install_steps_gtk.pm
parent530019effd566e71f900dde5cff3ee53c408b8a1 (diff)
downloaddrakx-9680a74c3cb9605cc8b5235fc7e82af5f48117e6.tar
drakx-9680a74c3cb9605cc8b5235fc7e82af5f48117e6.tar.gz
drakx-9680a74c3cb9605cc8b5235fc7e82af5f48117e6.tar.bz2
drakx-9680a74c3cb9605cc8b5235fc7e82af5f48117e6.tar.xz
drakx-9680a74c3cb9605cc8b5235fc7e82af5f48117e6.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 2181d02aa..06cc9809f 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -301,13 +301,11 @@ When sure, press Ok."))) {
#------------------------------------------------------------------------------
sub choosePackages {
my ($o, $packages, $compss, $compssUsers, $compssUsersSorted, $first_time) = @_;
- my $size = install_any::getAvailableSpace($o) * 0.7;
if ($::beginner) {
require pkgs;
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 1, $size, $o->{installClass}, $o->{isUpgrade});
+ pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, install_any::getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{isUpgrade});
} else {
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, $::expert ? 95 : 80, $size, $o->{installClass}) unless $::expert || $o->{isUpgrade};
install_steps_interactive::choosePackages(@_);
chooseSizeToInstall(@_);
choosePackagesTree(@_) if $::expert;
@@ -316,7 +314,7 @@ sub choosePackages {
sub chooseSizeToInstall {
my ($o, $packages, $compss, $compssUsers, $first_time) = @_;
my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024));
- my $current = pkgs::correctSize((sum map { $_->{size} } grep { $_->{selected} } values %$packages) / sqr(1024));
+ my $current = pkgs::correctedSelectedSize($packages);
my $w = my_gtk->new('');
my $adj = create_adjustment($current * 1.3, $current, $availableSpace);
my $spin = gtkset_usize(new Gtk::SpinButton($adj, 0, 0), 100, 0);