Attachment 6347 Details for Bug 3723 – Patch to prevent country/timezone locale package being removed during live install

Patch to prevent country/timezone locale package being removed during live install

0001-Ensure-country-timezone-locale-is-kept-when-removing.patch (text/plain), 1.17 KB, created by Martin Whitaker on 2015-04-25 00:09:16 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2015-04-25 00:09:16 CEST

Size: 1.17 KB

patch

obsolete

>From 2fbecdb149dca8d4c02707125d167a3cbc90a634 Mon Sep 17 00:00:00 2001
>From: Martin Whitaker <mageia@martin-whitaker.me.uk>
>Date: Fri, 24 Apr 2015 22:38:06 +0100
>Subject: [PATCH] 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.
>to correctly
>
>diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
>index e1e1b37..ba0022d 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);
>-- 
>2.3.2

From 2fbecdb149dca8d4c02707125d167a3cbc90a634 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 24 Apr 2015 22:38:06 +0100
Subject: [PATCH] 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.
to correctly

diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index e1e1b37..ba0022d 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);
-- 
2.3.2

Actions: View

Attachments on bug 3723: 2245 | 4175 | 4899 | 6347