summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-18 23:08:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-18 23:08:50 +0000
commit262903f3d6dc8c5b245ba4931a0f3cf55c6f915b (patch)
tree0f188cbc5f370ae2ac580d675de733c9e449822a /perl-install/install_steps_interactive.pm
parent10f1c2d98ebcf41baaf8d7bc3963e2ce40014404 (diff)
downloaddrakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar
drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar.gz
drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar.bz2
drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.tar.xz
drakx-262903f3d6dc8c5b245ba4931a0f3cf55c6f915b.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 4e2a9be74..7ceb35c08 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -281,16 +281,16 @@ sub choosePackages {
my $min_mark = 1;
my @l = values %{$packages->[0]};
my @flags = map { pkgs::packageFlagSelected($_) } @l;
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $available, $o->{installClass});
+ pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass});
my $max_size = pkgs::selectedSize($packages);
mapn { pkgs::packageSetFlagSelected(@_) } \@l, \@flags;
- if (!$::beginner && $max_size > $available) {
- $o->ask_okcancel('',
-_("You need %dMB for a full install of the groups you selected.
-You can go on anyway, but be warned that you won't get all packages", $max_size / sqr(1024)), 1) or goto &choosePackages
- }
- my $size2install = $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
+#- if (!$::beginner && $max_size > $available) {
+#- $o->ask_okcancel('',
+#-_("You need %dMB for a full install of the groups you selected.
+#-You can go on anyway, but be warned that you won't get all packages", $max_size / sqr(1024)), 1) or goto &choosePackages
+#- }
+ my $size2install = $::beginner && $first_time ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, $max_size, $available, $individual) or goto &choosePackages;
($o->{packages_}{ind}) =
pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass});
@@ -299,8 +299,8 @@ You can go on anyway, but be warned that you won't get all packages", $max_size
}
sub chooseSizeToInstall {
- my ($o, $packages, $min, $max) = @_;
- install_any::getAvailableSpace($o) * 0.7;
+ my ($o, $packages, $min, $max, $available) = @_;
+ $available * 0.7;
}
sub choosePackagesTree {}