summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-04-28 19:13:35 +0300
committerThomas Backlund <tmb@mageia.org>2015-04-28 19:13:35 +0300
commitc753c249f41575e447c9823e020e8c98ca3daa96 (patch)
treec6131e562cbe5dd13d0277c6ad968f7daf5f8250 /perl-install
parent37ed401c62c24940835eb03523f26daa1dc80107 (diff)
downloaddrakx-c753c249f41575e447c9823e020e8c98ca3daa96.tar
drakx-c753c249f41575e447c9823e020e8c98ca3daa96.tar.gz
drakx-c753c249f41575e447c9823e020e8c98ca3daa96.tar.bz2
drakx-c753c249f41575e447c9823e020e8c98ca3daa96.tar.xz
drakx-c753c249f41575e447c9823e020e8c98ca3daa96.zip
- localedrake:
o write input methods to /etc/locale.conf (mga#15464)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/lang.pm2
3 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 30a8773fd..4805c6f44 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- localedrake:
+ o write input methods to /etc/locale.conf (mga#15464)
- run vgchange before updating the list of LVMs, not after, and even if not
in install (should help with mga#7578).
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 349b2605a..7986719bb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- localedrake:
+ o write input methods to /etc/locale.conf (mga#15464)
- run vgchange before updating the list of LVMs, not after, and even if not
in install (should help with mga#7578).
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 96819d1e7..18400066d 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1467,6 +1467,8 @@ sub write {
# Only include valid fields and ommit any that are the same as LANG to make it cleaner
# (cleanup logic copied from systemd)
my @filtered_keys = grep { exists $h->{$_} && ($_ eq 'LANG' || !exists $h->{'LANG'} || $h->{$_} ne $h->{'LANG'}) } @locale_conf_fields;
+ my @filtered_input = grep { exists $h->{$_} } @IM_i18n_fields;
+ push (@filtered_keys, @filtered_input);
my $h2 = { map { $_ => $h->{$_} } @filtered_keys };
setVarsInShMode($::prefix . $file, 0644, $h2);