diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-16 20:03:15 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-16 20:03:15 +0000 |
| commit | 1130e84c3a27b0c1c6a05981137975b5c84bd9df (patch) | |
| tree | 07bf578b12d22bf70032838c8116242b3b918c16 | |
| parent | f7d35b5e13d69f57e2713ffab1129092287c5e73 (diff) | |
| download | drakx-1130e84c3a27b0c1c6a05981137975b5c84bd9df.tar drakx-1130e84c3a27b0c1c6a05981137975b5c84bd9df.tar.gz drakx-1130e84c3a27b0c1c6a05981137975b5c84bd9df.tar.bz2 drakx-1130e84c3a27b0c1c6a05981137975b5c84bd9df.tar.xz drakx-1130e84c3a27b0c1c6a05981137975b5c84bd9df.zip | |
remove auto-install special case (initialisation of compssUsersChoice)
| -rw-r--r-- | perl-install/install_any.pm | 5 |
1 files changed, 1 insertions, 4 deletions
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 |