From 9c3d8a5a3398fc4495296f6f30acd2c967397ff6 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 18 Aug 2008 12:45:24 +0000
Subject: (default_packages) fix selecting locales-XX for locales that specify
 scripting (#42663)

---
 perl-install/install/NEWS   | 1 +
 perl-install/install/any.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index bf9986d43..c8c14ecd3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - 2009.0 beta 2 logo
 - l10n:
+  o fix selecting locales-XX for locales that specify scripting (#42663)
   o update list of locales
   o update list of KDE languages for KDE4
 
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index cee100845..9eef9b195 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -530,7 +530,9 @@ sub default_packages {
     push @l, uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}});
     push @l, 'ntfs-3g' if any { $_->{fs_type} eq 'ntfs-3g' } @{$o->{fstab}};
 
-    my @locale_pkgs = map { URPM::packages_providing($o->{packages}, 'locales-' . $_) } lang::langsLANGUAGE($o->{locale}{langs});
+    # handle locales with specified scripting:
+    my @languages = map { s/\@.*//; $_ } lang::langsLANGUAGE($o->{locale}{langs});
+    my @locale_pkgs = map { URPM::packages_providing($o->{packages}, 'locales-' . $_) } @languages;
     unshift @l, uniq(map { $_->name } @locale_pkgs);
 
     @l;
-- 
cgit v1.2.1