summaryrefslogtreecommitdiffstats
path: root/perl-install/pkgs.pm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2015-04-24 22:38:06 +0100
committerRĂ©mi Verschelde <rverschelde@gmail.com>2015-04-25 10:14:51 +0200
commitdfa0fa4623025203d3ca1ed2a374d8e0d505a0b3 (patch)
tree367ec5e931918cf701de2c14faa35551c8679e7b /perl-install/pkgs.pm
parent736643d74b8c067171a84af7a2d252743ffd2ba5 (diff)
downloaddrakx-dfa0fa4623025203d3ca1ed2a374d8e0d505a0b3.tar
drakx-dfa0fa4623025203d3ca1ed2a374d8e0d505a0b3.tar.gz
drakx-dfa0fa4623025203d3ca1ed2a374d8e0d505a0b3.tar.bz2
drakx-dfa0fa4623025203d3ca1ed2a374d8e0d505a0b3.tar.xz
drakx-dfa0fa4623025203d3ca1ed2a374d8e0d505a0b3.zip
Ensure country/timezone locale is kept when removing unused locale packages.
The country locale needs to be converted to a base locale name when generating the list of package names (mga#3723).
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r--perl-install/pkgs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index e1e1b3725..ba0022d99 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -247,7 +247,7 @@ sub detect_unselected_locale_packages {
require lang;
my $locales_prefix = 'locales-';
my $locale = lang::read();
- my @selected_locales = map { $locales_prefix . $_ } lang::locale_to_main_locale($locale->{lang}), lang::c2locale($locale->{country});
+ my @selected_locales = map { $locales_prefix . $_ } lang::locale_to_main_locale($locale->{lang}), lang::locale_to_main_locale(lang::c2locale($locale->{country}));
my @available_locales = $do_pkgs->are_installed($locales_prefix . '*');
my @unneeded_locales = difference2(\@available_locales, \@selected_locales);
$do_pkgs->are_installed(@unneeded_locales);