diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-12 17:29:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-12 17:29:24 +0000 |
| commit | aff996326bb8276ad9237f1f3c8a9d0f1b7c09c5 (patch) | |
| tree | 7d4834b50fc24a6fe026aa4a12369a6f25c4d120 /perl-install/install_any.pm | |
| parent | 66741ece59351fed051b433885c5c704a308800b (diff) | |
| download | drakx-aff996326bb8276ad9237f1f3c8a9d0f1b7c09c5.tar drakx-aff996326bb8276ad9237f1f3c8a9d0f1b7c09c5.tar.gz drakx-aff996326bb8276ad9237f1f3c8a9d0f1b7c09c5.tar.bz2 drakx-aff996326bb8276ad9237f1f3c8a9d0f1b7c09c5.tar.xz drakx-aff996326bb8276ad9237f1f3c8a9d0f1b7c09c5.zip | |
fix selecting locales-LANG (it didn't really work, but it doesn't seem needed?)
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 9fb467cfa..735465811 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -380,11 +380,10 @@ sub setDefaultPackages { detect_devices::matching_desc('[nN][vV]idia.*Quadro'); - foreach (lang::langs($o->{locale}{langs}), substr(lang::c2locale($o->{locale}{country}), 0, 2)) { - unshift @{$o->{default_packages}}, map { $_->name } pkgs::packagesProviding($o->{packages}, "locales-$_"); - } - foreach (lang::langs($o->{locale}{langs}), #- mainly for zh in case of zh_TW.Big5 - lang::langsLANGUAGE($o->{locale}{langs})) { + my @locale_pkgs = map { pkgs::packagesProviding($o->{packages}, 'locales-' . $_) } lang::langsLANGUAGE($o->{locale}{langs}); + unshift @{$o->{default_packages}}, uniq(map { $_->name } @locale_pkgs); + + foreach (lang::langsLANGUAGE($o->{locale}{langs})) { $o->{compssUsersChoice}{qq(LOCALES"$_")} = 1; } $o->{compssUsersChoice}{'CHARSET"' . lang::l2charset($o->{locale}{lang}) . '"'} = 1; |