summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-01 11:27:56 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-01 11:27:56 +0200
commit4a52951ee6b66f64e60a9e41fffd8ee953a700db (patch)
tree5e3b6822d334ba5b2efea4bc7b2191c4874f1bff
parentb6ba61bde8116fd279dcaf4f8f2ad45efed1f160 (diff)
downloaddrakx-4a52951ee6b66f64e60a9e41fffd8ee953a700db.tar
drakx-4a52951ee6b66f64e60a9e41fffd8ee953a700db.tar.gz
drakx-4a52951ee6b66f64e60a9e41fffd8ee953a700db.tar.bz2
drakx-4a52951ee6b66f64e60a9e41fffd8ee953a700db.tar.xz
drakx-4a52951ee6b66f64e60a9e41fffd8ee953a700db.zip
perl_checker cleanups
-rw-r--r--perl-install/lang.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 18400066d..57482ae67 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 = map { $_ => $h{$_} || $h{LANG} || 'en_US' } @locale_conf_fields;
my $locale = system_locales_to_ourlocale($h{LC_MESSAGES}, $h{LC_MONETARY});
if (find { $h{$_} } @IM_i18n_fields) {
@@ -1466,16 +1466,16 @@ sub write {
log::explanations(qq(Setting locale configuration in "$file"));
# 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_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);
+ push @filtered_keys, @filtered_input;
my $h2 = { map { $_ => $h->{$_} } @filtered_keys };
setVarsInShMode($::prefix . $file, 0644, $h2);
- if ($h->{'SYSFONT'}) {
+ if ($h->{SYSFONT}) {
$file = '/etc/vconsole.conf';
- $h2 = { 'FONT' => $h->{'SYSFONT'} };
- $h2->{'FONT_UNIMAP'} = $h->{'SYSFONTACM'} if ($h->{'SYSFONTACM'});
+ $h2 = { 'FONT' => $h->{SYSFONT} };
+ $h2->{FONT_UNIMAP} = $h->{SYSFONTACM} if $h->{SYSFONTACM};
addVarsInShMode($::prefix . $file, 0644, $h2);
}
}