summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-03-11 11:42:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-03-11 11:42:21 +0000
commit7a6bf34eb529447bcd13cc5fab3af31901bad0f6 (patch)
tree8c597a8d30242bdc058f53ee54f314e2031c6451
parente6e13059a92382416f92bcd00aa45e091e7f32e8 (diff)
downloaddrakx-7a6bf34eb529447bcd13cc5fab3af31901bad0f6.tar
drakx-7a6bf34eb529447bcd13cc5fab3af31901bad0f6.tar.gz
drakx-7a6bf34eb529447bcd13cc5fab3af31901bad0f6.tar.bz2
drakx-7a6bf34eb529447bcd13cc5fab3af31901bad0f6.tar.xz
drakx-7a6bf34eb529447bcd13cc5fab3af31901bad0f6.zip
workaround code trying to install locales-nb (bugzilla #8287)
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2efaf83e8..dd92e6a25 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -909,7 +909,11 @@ sub summary {
val => sub { lang::c2name($o->{locale}{country}) },
clicked => sub {
any::selectCountry($o, $o->{locale}) or return;
- $o->do_pkgs->install('locales-' . substr(lang::getlocale_for_country($o->{locale}{lang}, $o->{locale}{country}), 0, 2));
+
+ #- 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") };
+
lang::write($o->{prefix}, $o->{locale});
if (!$timezone_manually_set) {
delete $o->{timezone};