gistfile.diff

 scripts/desktop_l10n.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/desktop_l10n.py b/scripts/desktop_l10n.py
index bf35e9c..0bc38fc 100755
--- a/scripts/desktop_l10n.py
+++ b/scripts/desktop_l10n.py
@@ -329,16 +329,23 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
             return self.bootstrap_env
         config = self.config
         replace_dict = self.query_abs_dirs()
         bootstrap_env = self.query_env(partial_env=config.get("bootstrap_env"),
                                        replace_dict=replace_dict)
         if config.get('en_us_binary_url') and \
            config.get('release_config_file'):
             bootstrap_env['EN_US_BINARY_URL'] = config['en_us_binary_url']
+        # Override en_us_binary_url if passed as a buildbot property
+        self.read_buildbot_config()
+        if self.buildbot_config.get("en_us_binary_url"):
+            self.info("Overriding en_us_binary_url with %s" %
+                      self.buildbot_config["en_us_binary_url"])
+            bootstrap_env['EN_US_BINARY_URL'] = \
+                self.buildbot_config["en_us_binary_url"]
         if 'MOZ_SIGNING_SERVERS' in os.environ:
             sign_cmd = self.query_moz_sign_cmd(formats=None)
             sign_cmd = subprocess.list2cmdline(sign_cmd)
             # windows fix
             bootstrap_env['MOZ_SIGN_CMD'] = sign_cmd.replace('\\', '\\\\\\\\')
         for binary in self._mar_binaries():
             # "mar -> MAR" and 'mar.exe -> MAR' (windows)
             name = binary.replace('.exe', '')