]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.14] gh-134262: increase retries in `Tools/build/generate_sbom.py` … (#135596)
authorEmma Smith <emma@emmatyping.dev>
Tue, 17 Jun 2025 11:50:15 +0000 (07:50 -0400)
committerGitHub <noreply@github.com>
Tue, 17 Jun 2025 11:50:15 +0000 (14:50 +0300)
Tools/build/generate_sbom.py

index 89f8f83999c47e1440ba5ea8d5d5ddd679989aaf..df52f8de762a01d4136362d2b8232040c3cb6973 100644 (file)
@@ -4,6 +4,7 @@ import glob
 import hashlib
 import json
 import os
+import random
 import re
 import subprocess
 import sys
@@ -164,16 +165,18 @@ def get_externals() -> list[str]:
 
 
 def download_with_retries(download_location: str,
-                          max_retries: int = 5,
-                          base_delay: float = 2.0) -> typing.Any:
+                          max_retries: int = 7,
+                          base_delay: float = 2.25,
+                          max_jitter: float = 1.0) -> typing.Any:
     """Download a file with exponential backoff retry."""
     for attempt in range(max_retries + 1):
         try:
             resp = urllib.request.urlopen(download_location)
         except urllib.error.URLError as ex:
             if attempt == max_retries:
-                raise ex
-            time.sleep(base_delay**attempt)
+                msg = f"Download from {download_location} failed."
+                raise OSError(msg) from ex
+            time.sleep(base_delay**attempt + random.uniform(0, max_jitter))
         else:
             return resp