Revert "Retry downloading external deb packages (#957)" (#959)

This reverts commit af2a0c3772.
This commit is contained in:
Caleb St. John
2025-12-12 14:57:47 -05:00
committed by GitHub
parent 4164a79109
commit 3623df931b

View File

@@ -7,7 +7,6 @@ import requests
import shutil
import stat
import tempfile
import time
from scale_build.config import SIGNING_KEY, SIGNING_PASSWORD
from scale_build.extensions import build_extensions as do_build_extensions
@@ -201,23 +200,19 @@ def download_and_install_deb_package(package_name, download_url, deb_filename, p
logger.info(f'Downloading {package_name} from {download_url}')
# Download the package using requests
for retry in itertools.count(1):
try:
response = requests.get(download_url, stream=True, timeout=60, allow_redirects=True)
response.raise_for_status()
try:
response = requests.get(download_url, stream=True, timeout=60, allow_redirects=True)
response.raise_for_status()
# Write the content to file in chunks to handle large files efficiently
with open(deb_path, 'wb') as f:
for chunk in response.iter_content(chunk_size=8192):
if chunk: # Filter out keep-alive chunks
f.write(chunk)
# Write the content to file in chunks to handle large files efficiently
with open(deb_path, 'wb') as f:
for chunk in response.iter_content(chunk_size=8192):
if chunk: # Filter out keep-alive chunks
f.write(chunk)
except requests.exceptions.RequestException as e:
logger.error(f'Failed to download {package_name}: {e}')
if retry >= 5:
raise RuntimeError(f'Failed to download {package_name} from {download_url}: {e}') from None
else:
time.sleep(10)
except requests.exceptions.RequestException as e:
logger.error(f'Failed to download {package_name}: {e}')
raise RuntimeError(f'Failed to download {package_name} from {download_url}: {e}')
# Verify the downloaded file exists and has content
if not os.path.exists(deb_path) or os.path.getsize(deb_path) == 0: