diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-04 12:05:55 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-04 12:05:55 +0000 |
commit | 1b7000ef112ef96ac58441762f38285ffbabb07d (patch) | |
tree | 70e68682dbad1f4a2ee4f532fcfcbd2f85dccae2 | |
parent | 435c4d078bd65e3d877fb5311ab2e90fc9ba53c9 (diff) | |
download | drakx-1b7000ef112ef96ac58441762f38285ffbabb07d.tar drakx-1b7000ef112ef96ac58441762f38285ffbabb07d.tar.gz drakx-1b7000ef112ef96ac58441762f38285ffbabb07d.tar.bz2 drakx-1b7000ef112ef96ac58441762f38285ffbabb07d.tar.xz drakx-1b7000ef112ef96ac58441762f38285ffbabb07d.zip |
(choosePackages): simplify, fix setSelectedFromCompssList not called in
expert even the first_time (especially nasty for auto_installs)
-rw-r--r-- | perl-install/install_steps.pm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 0000dc4e6..e97bb1529 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -272,18 +272,16 @@ sub choosePackages { my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024); log::l(sprintf "available size %s (corrected %s)", formatXiB($available), formatXiB($availableCorrected)); + add2hash_($o, { compssListLevel => 5 }) if !$::auto_install; + #- avoid destroying user selection of packages but only #- for expert, as they may have done individual selection before. if ($first_time || !$::expert) { install_any::unselectMostPackages($o); - unless ($::expert) { - add2hash_($o, { compssListLevel => 5 }) unless $::auto_install; - exists $o->{compssListLevel} - and pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $o->{compssListLevel}, $availableCorrected); - } + exists $o->{compssListLevel} + and pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $o->{compssListLevel}, $availableCorrected); } - $availableCorrected; } |