From 6014612651eebc355526981f93eaa5fbc519255b Mon Sep 17 00:00:00 2001
From: Pier Angelo Vendrame <pierov@torproject.org>
Date: Tue, 8 Nov 2022 14:32:56 +0100
Subject: [PATCH] fixup! Bug 40641: Use packaged locales on Firefox
Do not use firefox-l10n in testbuilds, since it is not available.
---
projects/firefox/build | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index 10b93fdfc..c6b940fac 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -134,11 +134,13 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
# Create .mozbuild to avoid interactive prompt in configure
mkdir "$HOME/.mozbuild"
-l10ncentral="$HOME/.mozbuild/l10n-central"
-mkdir "$l10ncentral"
-for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do
- tar -C "$l10ncentral" -xf "$tarball"
-done
+[% IF !c("var/testbuild") -%]
+ l10ncentral="$HOME/.mozbuild/l10n-central"
+ mkdir "$l10ncentral"
+ for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do
+ tar -C "$l10ncentral" -xf "$tarball"
+ done
+[% END %]
# PyYAML tries to read files as ASCII, otherwise
export LC_ALL=C.UTF-8
--
GitLab