Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
1d4c9a12
by Beatriz Rizental at 2025-02-12T10:17:24+01:00
1 changed file:
Changes:
| ... | ... | @@ -42,18 +42,27 @@ def get_firefox_tag(reference): |
| 42 | 42 | else:
|
| 43 | 43 | raise ValueError(f"Failed to extract version from reference '{reference}'.")
|
| 44 | 44 | |
| 45 | - tag = f"FIREFOX_{firefox_version.replace('.', '_')}_"
|
|
| 45 | + major_version = firefox_version.split(".")[0]
|
|
| 46 | + minor_patch_version = "_".join(firefox_version.split(".")[1:])
|
|
| 47 | + |
|
| 46 | 48 | remote_tags = git("ls-remote --tags origin")
|
| 47 | 49 | |
| 48 | 50 | # Each line looks like:
|
| 49 | 51 | # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1
|
| 50 | - pattern = rf"(.*){re.escape(tag)}(.*)$"
|
|
| 52 | + pattern = (
|
|
| 53 | + rf"(.*)FIREFOX_{re.escape(major_version)}_{re.escape(minor_patch_version)}(.*)$"
|
|
| 54 | + )
|
|
| 51 | 55 | match = re.search(pattern, remote_tags, flags=re.MULTILINE)
|
| 56 | + if not match:
|
|
| 57 | + # Attempt to match with a nightly tag, in case the ESR tag is not found
|
|
| 58 | + pattern = rf"(.*)FIREFOX_NIGHTLY_{re.escape(major_version)}(.*)$"
|
|
| 59 | + match = re.search(pattern, remote_tags, flags=re.MULTILINE)
|
|
| 60 | + |
|
| 52 | 61 | if match:
|
| 53 | 62 | return match.group(0).split()[0]
|
| 54 | 63 | else:
|
| 55 | 64 | raise ValueError(
|
| 56 | - f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'."
|
|
| 65 | + f"Failed to find reference specifier for Firefox tag of version '{firefox_version}' from '{reference}'."
|
|
| 57 | 66 | )
|
| 58 | 67 | |
| 59 | 68 |