Bug 1807161 - Fix desktop_comm_l10n.py to not use the fake "all" locale for revision info. r=dandarnell

Differential Revision: https://phabricator.services.mozilla.com/D165881

--HG--
extra : amend_source : b03dd08cbcce6852bd9ab7b75e39bd60d447c1e5
This commit is contained in:
Rob Lemley 2023-01-04 09:40:04 +11:00
Родитель 7ff3d1ddd7
Коммит 81054c7fec
1 изменённых файлов: 16 добавлений и 9 удалений

Просмотреть файл

@ -85,7 +85,7 @@ class CommMultiLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
self, self,
config_options=self.config_options, config_options=self.config_options,
require_config_file=require_config_file, require_config_file=require_config_file,
**buildscript_kwargs **buildscript_kwargs,
) )
self.upload_env = None self.upload_env = None
self.file_registry = None self.file_registry = None
@ -163,15 +163,22 @@ class CommMultiLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript):
if locales_file.endswith(".json"): if locales_file.endswith(".json"):
with open(locales_file) as fh: with open(locales_file) as fh:
locales_data = json.load(fh) locales_data = json.load(fh)
comm_l10n_revision = locales_data.get("all", {}).get("revision") # would use en-US, but it's not in this file!
comm_l10n_revision = locales_data.get("en-GB", {}).get("revision")
self.mkdir_p(dirs["abs_checkout_dir"]) if comm_l10n_revision:
self.vcs_checkout( self.mkdir_p(dirs["abs_checkout_dir"])
dest=dirs["abs_comm_l10n_dir"], self.vcs_checkout(
repo=c["hg_comm_l10n_repo"], dest=dirs["abs_comm_l10n_dir"],
branch=comm_l10n_revision, repo=c["hg_comm_l10n_repo"],
vcs="hg", branch=comm_l10n_revision,
) vcs="hg",
)
else:
raise Exception(
f"Unable to find revision from comm-l10n repo using "
f"{c['hg_comm_locales_file']}."
)
def merge_repos(self): def merge_repos(self):
dirs = self.query_abs_dirs() dirs = self.query_abs_dirs()