Mageia Bugzilla – Attachment 4899 Details for
Bug 3723
locale needed for country settings get lost in liveDVD / liveCD install
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
fix selection of unneeded locales in installer v2 (fixed
3723.diff (text/plain), 895 bytes, created by
Thierry Vignaud
on 2014-01-29 18:07:02 CET
(
hide
)
Description:
fix selection of unneeded locales in installer v2 (fixed
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2014-01-29 18:07:02 CET
Size:
895 bytes
patch
obsolete
>diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm >index 05fb93d..3d21c47 100644 >--- a/perl-install/pkgs.pm >+++ b/perl-install/pkgs.pm >@@ -242,9 +242,10 @@ sub detect_unselected_locale_packages { > require lang; > my $locales_prefix = 'locales-'; > my $locale = lang::read(); >- my $selected_locale = $locales_prefix . lang::locale_to_main_locale($locale->{lang}); >+ my @selected_locales = map { $locales_prefix . $_ } lang::locale_to_main_locale($locale->{lang}), $locales_prefix . lang::c2locale($locale->{country}); > my @available_locales = $do_pkgs->are_installed($locales_prefix . '*'); >- member($selected_locale, @available_locales) ? difference2(\@available_locales, [ $selected_locale ]) : (); >+ my @unneeded_locales = difference2(\@available_locales, \@selected_locales); >+ $do_pkgs->are_installed(@unneeded_locales); > } > > sub remove_unused_packages {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 05fb93d..3d21c47 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -242,9 +242,10 @@ sub detect_unselected_locale_packages { require lang; my $locales_prefix = 'locales-'; my $locale = lang::read(); - my $selected_locale = $locales_prefix . lang::locale_to_main_locale($locale->{lang}); + my @selected_locales = map { $locales_prefix . $_ } lang::locale_to_main_locale($locale->{lang}), $locales_prefix . lang::c2locale($locale->{country}); my @available_locales = $do_pkgs->are_installed($locales_prefix . '*'); - member($selected_locale, @available_locales) ? difference2(\@available_locales, [ $selected_locale ]) : (); + my @unneeded_locales = difference2(\@available_locales, \@selected_locales); + $do_pkgs->are_installed(@unneeded_locales); } sub remove_unused_packages {
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 3723
:
2245
|
4175
| 4899 |
6347