summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-11 15:01:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-11 15:01:59 +0000
commit4e19d0cf18547bb20418dd956f92342a8383847c (patch)
tree9317b395b0941f6bc0baf83dabea909696d79b74
parentf349023599f2fdc021bea2eb6a17c9eaa46aaaea (diff)
downloaddrakx-4e19d0cf18547bb20418dd956f92342a8383847c.tar
drakx-4e19d0cf18547bb20418dd956f92342a8383847c.tar.gz
drakx-4e19d0cf18547bb20418dd956f92342a8383847c.tar.bz2
drakx-4e19d0cf18547bb20418dd956f92342a8383847c.tar.xz
drakx-4e19d0cf18547bb20418dd956f92342a8383847c.zip
nice fix for installing locales-XX corresponding the chosen country (using packagesProviding())
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index dd92e6a25..e0cd40286 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -910,9 +910,9 @@ sub summary {
clicked => sub {
any::selectCountry($o, $o->{locale}) or return;
- #- this is somehow broken so catching errors (eg: lang=nb and country=NO)
my $pkg_locale = substr(lang::getlocale_for_country($o->{locale}{lang}, $o->{locale}{country}), 0, 2);
- eval { $o->do_pkgs->install("locales-$pkg_locale") };
+ my @pkgs = pkgs::packagesProviding($o->{packages}, "locales-$pkg_locale");
+ $o->pkg_install(map { $_->name } @pkgs) if @pkgs;
lang::write($o->{prefix}, $o->{locale});
if (!$timezone_manually_set) {