summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-27 12:27:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-27 12:27:08 +0000
commit7b470feb8d04c53322891dd834d86a7480e68a81 (patch)
tree50bf9a911802b428135cd500d01d88763a7a03b4 /perl-install/install_any.pm
parente4ec66d3ef1c53863ec15f509b54da117a6bb69e (diff)
downloaddrakx-7b470feb8d04c53322891dd834d86a7480e68a81.tar
drakx-7b470feb8d04c53322891dd834d86a7480e68a81.tar.gz
drakx-7b470feb8d04c53322891dd834d86a7480e68a81.tar.bz2
drakx-7b470feb8d04c53322891dd834d86a7480e68a81.tar.xz
drakx-7b470feb8d04c53322891dd834d86a7480e68a81.zip
(setPackages): default profiles selection to GNOME, KDE, CONFIG
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ac8e18582..3876cff74 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -321,6 +321,12 @@ sub setPackages {
if ($::auto_install && !$o->{compssUsersChoice}) {
$o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}{flags}} } @{$o->{compssUsersSorted}};
}
+ if (!$::auto_install) {
+ #- by default, choose:
+ $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG';
+ $o->{compssUsersChoice}{$_} = 1
+ foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station';
+ }
$o->{compssUsersChoice}{TV} = 1 if grep { $_->{driver} eq 'bttv' } detect_devices::probeall();
$o->{compssUsersChoice}{SYSTEM} = 1;
$o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
@@ -341,7 +347,7 @@ sub setPackages {
pkgs::packageByName($o->{packages}, "locales-$_") or next;
push @{$o->{default_packages}}, "locales-$_";
}
- foreach (lang::langs($o->{langs})) {
+ foreach (lang::langsLANGUAGE($o->{langs})) {
$o->{compssUsersChoice}{qq(LOCALES"$_")} = 1;
}
#- for the first time, select package to upgrade.