Merge pull request #2366 from mozilla/issue2365

Allow specifying --branch when getting decoder URL
2019-09-23 11:59:54 +02:00 · 2019-09-23 11:59:54 +02:00 · 005b5a8c3b
parent b2e3a43767 82a5b37073
commit 005b5a8c3b
1 changed files with 5 additions and 4 deletions
--- a/util/taskcluster.py
+++ b/util/taskcluster.py
@ -118,10 +118,11 @@ def main():
        if plat == 'darwin':
            plat = 'macosx_10_10'

+        if has_branch_set:
+            ds_version = args.branch.lstrip('v')
+        else:
            version_string = read('../VERSION').strip()
            ds_version = parse_version(version_string)
-
-        if not has_branch_set:
            args.branch = "v{}".format(version_string)

        m_or_mu = 'mu' if is_ucs2 else 'm'