diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-03-11 15:03:23 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-03-11 15:03:23 +0000 |
| commit | cd3eb916d1fd7b516d3a4a65cbde6b66913dfae1 (patch) | |
| tree | 1b31b0d79de3cd9e4a13b484af1ed00aefbe3154 | |
| parent | 89bb035e2458ab187375178fe3fa067bd405f10f (diff) | |
| download | drakx-cd3eb916d1fd7b516d3a4a65cbde6b66913dfae1.tar drakx-cd3eb916d1fd7b516d3a4a65cbde6b66913dfae1.tar.gz drakx-cd3eb916d1fd7b516d3a4a65cbde6b66913dfae1.tar.bz2 drakx-cd3eb916d1fd7b516d3a4a65cbde6b66913dfae1.tar.xz drakx-cd3eb916d1fd7b516d3a4a65cbde6b66913dfae1.zip | |
fix installing locales-XX for lang=nb which needs locales-no (one needs to use provides)
| -rw-r--r-- | perl-install/install_any.pm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 4d4799be5..862d3711b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -388,13 +388,11 @@ sub setDefaultPackages { detect_devices::matching_desc('[nN][vV]idia.*Quadro'); - foreach (lang::langs($o->{locale}{langs})) { - pkgs::packageByName($o->{packages}, "locales-$_") or next; - unshift @{$o->{default_packages}}, "locales-$_"; - $o->{compssUsersChoice}{qq(LOCALES"$_")} = 1; #- mainly for zh in case of zh_TW.Big5 + 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-$_"); } - unshift @{$o->{default_packages}}, 'locales-' . substr(lang::c2locale($o->{locale}{country}), 0, 2); - foreach (lang::langsLANGUAGE($o->{locale}{langs})) { + foreach (lang::langs($o->{locale}{langs}), #- mainly for zh in case of zh_TW.Big5 + lang::langsLANGUAGE($o->{locale}{langs})) { $o->{compssUsersChoice}{qq(LOCALES"$_")} = 1; } $o->{compssUsersChoice}{'CHARSET"' . lang::l2charset($o->{locale}{lang}) . '"'} = 1; |