summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-12-13 15:29:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-12-13 15:29:27 +0000
commit9fb537f048f02d580f90b47cf9b6659b05847f02 (patch)
treea54666a197c9e9288d9aed7adde80c792afe52a2
parent83fe4244faa9c06a3888645a0fc21df97f96f1c1 (diff)
downloaddrakx-9fb537f048f02d580f90b47cf9b6659b05847f02.tar
drakx-9fb537f048f02d580f90b47cf9b6659b05847f02.tar.gz
drakx-9fb537f048f02d580f90b47cf9b6659b05847f02.tar.bz2
drakx-9fb537f048f02d580f90b47cf9b6659b05847f02.tar.xz
drakx-9fb537f048f02d580f90b47cf9b6659b05847f02.zip
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)
-rw-r--r--perl-install/pkgs.pm11
1 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 3b210dd91..bb6efaf3d 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -627,8 +627,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 {