summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-09 00:27:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-09 00:27:09 +0000
commit3ccabbe1682a659946715d15bb9e173780491f1d (patch)
treed460fdb152e636359f89511ef79cc55c2539e4fc /perl-install
parentf0432e6c8cbec114239adb931cd0b2a4d3349700 (diff)
downloaddrakx-3ccabbe1682a659946715d15bb9e173780491f1d.tar
drakx-3ccabbe1682a659946715d15bb9e173780491f1d.tar.gz
drakx-3ccabbe1682a659946715d15bb9e173780491f1d.tar.bz2
drakx-3ccabbe1682a659946715d15bb9e173780491f1d.tar.xz
drakx-3ccabbe1682a659946715d15bb9e173780491f1d.zip
cleanup IM2packages()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/lang.pm11
1 files changed, 7 insertions, 4 deletions
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: