diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-07-07 14:58:27 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-07-07 14:58:27 +0000 |
| commit | 7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5 (patch) | |
| tree | 5fa035fa39c82ecf43220b4e96bb00fbe16fc9c6 /perl-install/install_steps_interactive.pm | |
| parent | 7b975041ea5dfe72e19f00bbf1237f8e3cb3e7f3 (diff) | |
| download | drakx-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar drakx-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar.gz drakx-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar.bz2 drakx-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.tar.xz drakx-7eba5b3a2b6c8dc1f6b2cb9d16abf648d5cbddc5.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index e42245ba3..924f1a6ea 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -285,22 +285,27 @@ sub choosePackages { $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual) unless $::beginner || $::corporate; - my $min_mark = $::beginner ? 25 : 1; - my @l = values %{$packages->[0]}; - my @flags = map { pkgs::packageFlagSelected($_) } @l; - pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass}); - my $max_size = 1 + pkgs::selectedSize($packages); #- avoid division by zero. - mapn { pkgs::packageSetFlagSelected(@_) } \@l, \@flags; + #- avoid reselection of package if individual selection is requested and this is not the first time. + if ($first_time || !$individual) { + my $min_mark = $::beginner ? 25 : 1; + my @l = values %{$packages->[0]}; + my @flags = map { pkgs::packageFlagSelected($_) } @l; + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass}); + my $max_size = 1 + pkgs::selectedSize($packages); #- avoid division by zero. + mapn { pkgs::packageSetFlagSelected(@_) } \@l, \@flags; #- if (!$::beginner && $max_size > $availableC) { #- $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 ? $availableC * 0.7 : $o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) or goto &choosePackages; + my $size2install = $::beginner && $first_time ? $availableC * 0.7 : + $o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) or goto &choosePackages; + + ($o->{packages_}{ind}) = + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass}); + } - ($o->{packages_}{ind}) = - pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass}); $o->choosePackagesTree($packages, $compss) if $individual; } |