From a80f9158c513830bc46064cbd75bcd4b1ee27697 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 13 Dec 2005 15:35:56 +0000 Subject: package lsb is requiring many locales though we don't want it to be installed only if those many locales are chosen. So discarding those locales requires (bugzilla #20183) --- perl-install/pkgs.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 33e497995..18007437c 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -632,8 +632,15 @@ sub read_rpmsrate { foreach (keys %$flags) { my $p = packageByName($packages, $_) or next; - my @flags = (@{$flags->{$_}}, map { if_(/locales-(.*)/, qq(LOCALES"$1")) } $p->requires_nosense); - + my @flags = @{$flags->{$_}}; + if (my @l = map { if_(/locales-(.*)/, qq(LOCALES"$1")) } $p->requires_nosense) { + if (@l > 1) { + log::l("ERROR: package $_ is requiring many locales") if $_ ne 'lsb'; + } else { + push @flags, @l; + } + } + @flags = map { my ($user_flags, $known_flags) = partition { /^!?CAT_/ } split('\|\|', $_); my $ok = find { -- cgit v1.2.1