summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-21 07:55:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-21 07:55:32 +0000
commitc7fc02ade71cad25b5b749ec1473c836f3dc7e10 (patch)
tree1c363b01757664f3a19b3820dfac0fd429cb58af
parentcd999d1a5d5b8767f3f268f0a11e85cc45a52632 (diff)
downloaddrakx-c7fc02ade71cad25b5b749ec1473c836f3dc7e10.tar
drakx-c7fc02ade71cad25b5b749ec1473c836f3dc7e10.tar.gz
drakx-c7fc02ade71cad25b5b749ec1473c836f3dc7e10.tar.bz2
drakx-c7fc02ade71cad25b5b749ec1473c836f3dc7e10.tar.xz
drakx-c7fc02ade71cad25b5b749ec1473c836f3dc7e10.zip
- correctly set country when given lang=xxx on /proc/cmdline
(regression introduced in 10.16) (#39104)
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/install2.pm2
-rw-r--r--perl-install/lang.pm8
3 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cc4255a35..9b6b654f6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- correctly set country when given lang=xxx on /proc/cmdline
+ (regression introduced in 10.16) (#39104)
+
Version 10.18 - 21 March 2008
- when reformatting swap, keep existing UUID (#38877)
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 9f2dda1cc..ab09f0874 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -522,7 +522,7 @@ sub main {
#- for auto_install compatibility with old $o->{lang},
#- and also for --lang and --flang
if ($o->{lang}) {
- put_in_hash($o->{locale}, lang::system_locales_to_ourlocale($o->{lang}, $o->{lang}));
+ put_in_hash($o->{locale}, lang::lang_to_ourlocale($o->{lang}));
}
lang::set($o->{locale});
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 6e1dfbcfc..28b447e95 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1037,6 +1037,14 @@ sub system_locales_to_ourlocale {
$locale;
}
+sub lang_to_ourlocale {
+ my ($lang) = @_;
+
+ my $locale = system_locales_to_ourlocale($lang);
+ lang_changed($locale);
+ $locale;
+}
+
sub lang_changed {
my ($locale) = @_;
my $h = analyse_locale_name(l2locale($locale->{lang}));