summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-10 02:48:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-10 02:48:40 +0000
commit556694585bebcd2da59864b26dcc3d1717942956 (patch)
treea04537ef5710142b4051d3aebddc36c6cae05815
parenta21b264f3df0a0cbba4e11092c1020b4c62d31eb (diff)
downloaddrakx-556694585bebcd2da59864b26dcc3d1717942956.tar
drakx-556694585bebcd2da59864b26dcc3d1717942956.tar.gz
drakx-556694585bebcd2da59864b26dcc3d1717942956.tar.bz2
drakx-556694585bebcd2da59864b26dcc3d1717942956.tar.xz
drakx-556694585bebcd2da59864b26dcc3d1717942956.zip
en_ZA locales are removed by hand, we also have to skip them from the rpm file list
-rwxr-xr-xmove/data/make_i18n_list3
1 files changed, 2 insertions, 1 deletions
diff --git a/move/data/make_i18n_list b/move/data/make_i18n_list
index 33c77f26d..df53d39fb 100755
--- a/move/data/make_i18n_list
+++ b/move/data/make_i18n_list
@@ -31,7 +31,8 @@ foreach my $i18n (@pkg_langs) {
my @pkgs = uniq("locales-$i18n", chomp_(`$rpm -q --qf "%{name}\n" --whatrequires locales-$i18n`));
push @pkgs, split(' ', $extra_pkgs{$i18n} || '');
- my ($dirs, $files) = partition { -d "$prefix$_" } uniq(chomp_(`$rpm -ql @pkgs`));
+ my @l = grep { !m!^/usr/share/locale/en_ZA! } uniq(chomp_(`$rpm -ql @pkgs`));
+ my ($dirs, $files) = partition { -d "$prefix$_" } @l;
my @i18n_dirs = uniq(grep { m!/($i18n_re) (_[^/]*)? (\.[^/]*)? (\@[^/]*)?$!x } @$dirs);
my $i18n_dirs_re = join('|', map { quotemeta $_ } @i18n_dirs);