From 1130e84c3a27b0c1c6a05981137975b5c84bd9df Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sun, 16 Sep 2001 20:03:15 +0000 Subject: remove auto-install special case (initialisation of compssUsersChoice) --- perl-install/install_any.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'perl-install/install_any.pm') diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index bb1271cab..6990cc418 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -357,10 +357,7 @@ sub setPackages { pkgs::read_rpmsrate($o->{packages}, getFile("Mandrake/base/rpmsrate")); ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{meta_class}); - if ($::auto_install && !$o->{interactive} && !$o->{compssUsersChoice}) { - $o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}{flags}} } @{$o->{compssUsersSorted}}; - } - if ($o->{interactive} && !$o->{isUpgrade}) { + if (!$o->{compssUsersChoice} && !$o->{isUpgrade}) { #- by default, choose: $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG'; $o->{compssUsersChoice}{$_} = 1 -- cgit v1.2.1