diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-06 22:48:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-06 22:48:08 +0000 |
| commit | bb6492e7bf3b348808cc2102c840fc91a3bff7b0 (patch) | |
| tree | 2b966cfe2b006a6cc66f575ee5f9995a787dc2ff /perl-install/pkgs.pm | |
| parent | 5e2862087db257f94597369f6923eccc3ae6f419 (diff) | |
| download | drakx-backup-do-not-use-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar drakx-backup-do-not-use-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar.gz drakx-backup-do-not-use-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar.bz2 drakx-backup-do-not-use-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.tar.xz drakx-backup-do-not-use-bb6492e7bf3b348808cc2102c840fc91a3bff7b0.zip | |
no_comment
Diffstat (limited to 'perl-install/pkgs.pm')
| -rw-r--r-- | perl-install/pkgs.pm | 9 |
1 files changed, 4 insertions, 5 deletions
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; |