From 1b7000ef112ef96ac58441762f38285ffbabb07d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 4 Aug 2001 12:05:55 +0000 Subject: (choosePackages): simplify, fix setSelectedFromCompssList not called in expert even the first_time (especially nasty for auto_installs) --- perl-install/install_steps.pm | 10 ++++------ 1 file 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; } -- cgit v1.2.1