This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch main in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push: new 60146126 fixup! Bug 40641: Use packaged locales on Firefox 60146126 is described below

commit 6014612651eebc355526981f93eaa5fbc519255b Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Nov 8 14:32:56 2022 +0100

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 10b93fdf..c6b940fa 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