From 3ccabbe1682a659946715d15bb9e173780491f1d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 9 Aug 2005 00:27:09 +0000
Subject: cleanup IM2packages()

---
 perl-install/lang.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 1de345c3b..ced60d996 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -682,10 +682,13 @@ my %IM2packages = (
 sub IM2packages {
     my ($locale) = @_;
     my $im = $locale->{IM};
-    return if $im eq "None";
-    my $lang = analyse_locale_name($locale->{lang})->{main};
-    my $packages = $IM2packages{$im}{$lang} || $IM2packages{$im}{generic};
-    return $packages ? @$packages : $im;
+    if ($im eq "None") {
+	();
+    } else {
+	my $lang = analyse_locale_name($locale->{lang})->{main};
+	my $l = $IM2packages{$im}{$lang} || $IM2packages{$im}{generic} || [ $im ];
+	@$l;
+    }
 }
 
 # enable to select extra SCIM combinaisons:
-- 
cgit v1.2.1