summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-15 22:26:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-15 22:26:52 +0000
commit2f945a508c3dab874c42e4455bdd0f1de161e3f5 (patch)
treecbd8bf4bf726ec5b2e810e9c501a7dd9b38d514a /perl-install
parente86580833b632263c38a7951dee9567a7dd0bca2 (diff)
downloaddrakx-2f945a508c3dab874c42e4455bdd0f1de161e3f5.tar
drakx-2f945a508c3dab874c42e4455bdd0f1de161e3f5.tar.gz
drakx-2f945a508c3dab874c42e4455bdd0f1de161e3f5.tar.bz2
drakx-2f945a508c3dab874c42e4455bdd0f1de161e3f5.tar.xz
drakx-2f945a508c3dab874c42e4455bdd0f1de161e3f5.zip
- remove obsolete code
- the result is to use directly $availableC instead $size2install which was min($availableC, $max_size)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm32
1 files changed, 1 insertions, 31 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 10d36d09a..d58232ca4 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -507,38 +507,8 @@ sub choosePackages {
$o->chooseGroups($packages, $compssUsers, $min_mark, \$individual, $max_size) if !$::corporate;
- my $size2install = min($availableC, do {
- my $max = round_up(min($max_size, $availableC) / sqr(1024), 100);
-
- if (1) {
- my (@l);
- my @text = (__("Minimum (%dMB)"), __("Recommended (%dMB)"), __("Complete (%dMB)"));
- if ($o->{meta_class} eq 'desktop') {
- @l = (300, 500, 800, 0);
- $max > $l[2] or splice(@l, 2, 1);
- $max > $l[1] or splice(@l, 1, 1);
- $max > $l[0] or @l = $max;
- $text[$#l] = __("Custom");
- } else {
- @l = (300, 700, $max);
- $l[2] > $l[1] + 200 or splice(@l, 1, 1); #- not worth proposing too alike stuff
- $l[1] > $l[0] + 100 or splice(@l, 0, 1);
- }
- $o->set_help('empty');
-# $o->ask_from_listf('', _("Select the size you want to install"),
-# sub { _ ($text[$_[0]], $_[0]) }, \@l, $l[1]) * sqr(1024);
- $max * sqr(1024);
- } else {
- $o->chooseSizeToInstall($packages, $min_size, $def_size, $max_size, $availableC, $individual) || goto &choosePackages;
- }
- });
- if (!$size2install) { #- special case for desktop
- $o->chooseGroups($packages, $compssUsers, $min_mark) or goto &choosePackages;
- $size2install = $availableC;
- }
-
($o->{packages_}{ind}) =
- pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $min_mark, $size2install);
+ pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $min_mark, $availableC);
$o->choosePackagesTree($packages) if $individual;