From bb6492e7bf3b348808cc2102c840fc91a3bff7b0 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 6 Jan 2000 22:48:08 +0000 Subject: no_comment --- perl-install/pkgs.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 5218364cc..f5ae719d5 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -262,10 +262,9 @@ sub readCompssList($$$) { } my %done; - foreach (split ':', $ENV{LANGUAGE}) { - my $locales = "locales-" . substr($_, 0, 2); - my $p = $packages->{$locales} or next; - foreach ($locales, @{$p->{provides} || []}, @{$by_lang{$_} || []}) { + my $locales = "locales-" . substr($ENV{LANG}, 0, 2); + if (my $p = $packages->{$locales}) { + foreach ($locales, @{$p->{provides} || []}, @{$by_lang{$ENV{LANG}} || []}) { next if $done{$_}; $done{$_} = 1; my $p = $packages->{$_} or next; $p->{values} = [ map { $_ + 90 } @{$p->{values} || [ (0) x $nb_values ]} ]; @@ -327,7 +326,7 @@ sub setSelectedFromCompssList { my $nb = 0; foreach (@packages) { $nb += $_->{size} if $_->{selected}; } - if ($nb > $max_size) { + if ($max_size && $nb > $max_size) { unselect($packages, $p); $min_level = $p->{values}[$ind]; last; -- cgit v1.2.1