summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-22 12:21:25 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-25 17:04:12 +0200
commit0522d5c3825ca72af084c64f0b96377dbc5f28fd (patch)
treed1cfe2ac7d4bbedf5c12d4e5e767c65fd8fca96b
parenta4c04bd8cccf5826f254f129f81155d12d2b7752 (diff)
downloaddrakx-0522d5c3825ca72af084c64f0b96377dbc5f28fd.tar
drakx-0522d5c3825ca72af084c64f0b96377dbc5f28fd.tar.gz
drakx-0522d5c3825ca72af084c64f0b96377dbc5f28fd.tar.bz2
drakx-0522d5c3825ca72af084c64f0b96377dbc5f28fd.tar.xz
drakx-0522d5c3825ca72af084c64f0b96377dbc5f28fd.zip
fix reading back IM config (mga#15761)
regression introduced in commit 6c23072af9db257153d993e6a87bfc02b69a2263
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/lang.pm2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4bb92f104..5f9227249 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- diskdrake:
o set pt_type according to fs_type before flag cases (mga#16029)
+- localedrake:
+ o fix reading back IM config (mga#15761)
Version 16.99 - 20 May 2015
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9eead82e5..5cff2c468 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- die is not an option here (mga#8819)
o just log the faillure and offer to either retry or abort
+- locale setting
+ o fix reading back IM config (mga#15761)
- partitioning:
o set pt_type according to fs_type before flag cases (mga#16029)
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index f9ab88892..7deafa956 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1345,7 +1345,7 @@ sub read {
$f2 = "$::prefix/etc/sysconfig/i18n" if ! -e $f2 && -e "$::prefix/etc/sysconfig/i18n";
my %h = getVarsFromSh($b_user_only && -e $f1 ? $f1 : $f2);
# Fill in defaults (from LANG= variable)
- %h = map { $_ => $h{$_} || $h{LANG} || 'en_US' } @locale_conf_fields;
+ $h{$_} ||= $h{LANG} || 'en_US' foreach @locale_conf_fields;
my $locale = system_locales_to_ourlocale($h{LC_MESSAGES}, $h{LC_MONETARY});
if (find { $h{$_} } @IM_i18n_fields) {