From dfa0fa4623025203d3ca1ed2a374d8e0d505a0b3 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 24 Apr 2015 22:38:06 +0100 Subject: 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). --- perl-install/NEWS | 3 +++ perl-install/pkgs.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index fcf843027..f67142e74 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- ensure country/timezone locale is kept when removing unused locale + packages (mga#3723) + Version 16.87 - 22 April 2015 - partitioning_wizard: 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); -- cgit v1.2.1