From 7a6bf34eb529447bcd13cc5fab3af31901bad0f6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 11 Mar 2004 11:42:21 +0000 Subject: workaround code trying to install locales-nb (bugzilla #8287) --- perl-install/install_steps_interactive.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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}; -- cgit v1.2.1