From 60422f2931b79f06c562e7f1b38501001250e09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?= Date: Tue, 3 Dec 2024 15:51:21 +0100 Subject: build: fix the URLError import statement Currently it was not working due to the strange import strategy overriding 'urllib' Pick-to: 6.8 Change-Id: I7b773ba53c800dd408afdb9e77a71ea77887df4e Reviewed-by: Friedemann Kleint --- build_scripts/utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build_scripts/utils.py') diff --git a/build_scripts/utils.py b/build_scripts/utils.py index a75fb7db9..43ff9e003 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -12,7 +12,8 @@ import stat import subprocess import sys import tempfile -import urllib.request as urllib +import urllib.request +import urllib.error from collections import defaultdict from pathlib import Path from textwrap import dedent, indent @@ -518,9 +519,9 @@ def download_and_extract_7z(fileurl, target): for i in range(1, 10): try: log.info(f"Downloading fileUrl {fileurl}, attempt #{i}") - localfile, info = urllib.urlretrieve(fileurl) + localfile, info = urllib.request.urlretrieve(fileurl) break - except urllib.URLError: + except urllib.error.URLError: pass if not localfile: log.error(f"Error downloading {fileurl} : {info}") -- cgit v1.2.3