From 6acbffcfa543f073cadaf43969dd20a0d41e2e8d Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Wed, 14 Oct 2015 10:42:29 -0400 Subject: [PATCH] Bug 1184089 - L10N nightly repacks should not manipulate mozconfigs. r=Callek DONTBUILD --- testing/mozharness/configs/merge_day/aurora_to_beta.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/mozharness/configs/merge_day/aurora_to_beta.py b/testing/mozharness/configs/merge_day/aurora_to_beta.py index 3b20555b2683..af9923bd0a10 100644 --- a/testing/mozharness/configs/merge_day/aurora_to_beta.py +++ b/testing/mozharness/configs/merge_day/aurora_to_beta.py @@ -28,7 +28,8 @@ config = { for f in ["debug", "nightly"] ] + [ # File, from, to - (f, "ac_add_options --with-branding=browser/branding/aurora", "") + (f, "ac_add_options --with-branding=browser/branding/aurora", + "ac_add_options --enable-official-branding") for f in ["browser/config/mozconfigs/linux32/l10n-mozconfig", "browser/config/mozconfigs/linux64/l10n-mozconfig", "browser/config/mozconfigs/win32/l10n-mozconfig",