diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-12-13 15:35:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-12-13 15:35:56 +0000 |
| commit | a80f9158c513830bc46064cbd75bcd4b1ee27697 (patch) | |
| tree | 255621108b0adf4388dc1107ab06f93c24b03a04 | |
| parent | 43d1e8e183da5fae5a5e94cbd6d53b00f3bbce7b (diff) | |
| download | drakx-backup-do-not-use-topic/MDK-10_2-update.tar drakx-backup-do-not-use-topic/MDK-10_2-update.tar.gz drakx-backup-do-not-use-topic/MDK-10_2-update.tar.bz2 drakx-backup-do-not-use-topic/MDK-10_2-update.tar.xz drakx-backup-do-not-use-topic/MDK-10_2-update.zip | |
package lsb is requiring many locales though we don't want it to be installedtopic/MDK-10_2-update
only if those many locales are chosen. So discarding those locales requires
(bugzilla #20183)
| -rw-r--r-- | perl-install/pkgs.pm | 11 |
1 files 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 { |