diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-08-14 14:36:07 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-08-14 14:36:07 +0000 |
| commit | c231a43106143e04ad0cb7f2542723cfec66777d (patch) | |
| tree | af1173dc7b4aa4e4ae0745fab9feb816ee74d939 | |
| parent | 9122b5609b501554a312d851e9433a0d2a081491 (diff) | |
| download | drakx-c231a43106143e04ad0cb7f2542723cfec66777d.tar drakx-c231a43106143e04ad0cb7f2542723cfec66777d.tar.gz drakx-c231a43106143e04ad0cb7f2542723cfec66777d.tar.bz2 drakx-c231a43106143e04ad0cb7f2542723cfec66777d.tar.xz drakx-c231a43106143e04ad0cb7f2542723cfec66777d.zip | |
- fix choice of packages when auto install
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 9373a1bb6..5c2c9afa6 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -350,10 +350,10 @@ sub setPackages { pkgs::read_rpmsrate($o->{packages}, getFile("Mandrake/base/rpmsrate")); ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{meta_class}); - if ($::auto_install && !$o->{compssUsersChoice}) { + if ($::auto_install && !$o->{interactive} && !$o->{compssUsersChoice}) { $o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}{flags}} } @{$o->{compssUsersSorted}}; } - if (!$::auto_install && !$o->{isUpgrade}) { + if ($o->{interactive} && !$o->{isUpgrade}) { #- by default, choose: $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG'; $o->{compssUsersChoice}{$_} = 1 @@ -362,7 +362,7 @@ sub setPackages { $o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::get_that_type($_) } ('tv', 'scanner', 'photo', 'sound'); $o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall(); $o->{compssUsersChoice}{SYSTEM} = 1; - $o->{compssUsersChoice}{X} = 1 if !$::auto_install; + $o->{compssUsersChoice}{X} = 1 if !$o->{interactive}; $o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners(); $o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms(); $o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA(); |