Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1339641 - update l10n_bumper. r=rail

Browse Source 
This patch addresses some missed review comments from bug 1337645, and uses curl instead of self.download_file to avoid old python ssl errors.
This commit is contained in:
Aki Sasaki 2017-02-14 19:48:27 -08:00
parent 34befa93b6
commit d223e7edf4
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
testing/mozharness/scripts/l10n_bumper.py
View File

@ -71,14 +71,6 @@ class L10nBumper(VCSScript):
self.abs_dirs = abs_dirs
return self.abs_dirs
def hg_add(self, repo_path, path):
"""
Runs 'hg add' on path
"""
hg = self.query_exe('hg', return_type='list')
cmd = hg + ['add', path]
self.run_command(cmd, cwd=repo_path)
def hg_commit(self, repo_path, message):
"""
Commits changes in repo_path, with specified user and commit message
@ -114,9 +106,6 @@ class L10nBumper(VCSScript):
return True
def _read_json(self, path):
if not os.path.exists(path):
self.error("%s doesn't exist!" % path)
return
contents = self.read_from_file(path)
try:
json_contents = json.loads(contents)
@ -159,11 +148,9 @@ class L10nBumper(VCSScript):
treestatus_json = os.path.join(dirs['abs_work_dir'], 'treestatus.json')
if not os.path.exists(dirs['abs_work_dir']):
self.mkdir_p(dirs['abs_work_dir'])
self.rmtree(treestatus_json)
if self.download_file(treestatus_url, file_name=treestatus_json) != treestatus_json:
# Failed to check tree status...assume we can land
self.info("failed to check tree status - assuming we can land")
return True
self.run_command(["curl", "--retry", "4", "-o", treestatus_json, treestatus_url], throw_exception=True)
treestatus = self._read_json(treestatus_json)
if treestatus['result']['status'] != 'closed':