From cf8216aea98b7fa2b5806db49a095a116f178977 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 6 Jun 2020 15:18:29 +0200 Subject: [PATCH] sources/files: don't spam stderr with error messages Silence the errors, but include instead the error code in the returned error message. Signed-off-by: Tom Gundersen --- sources/org.osbuild.files | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sources/org.osbuild.files b/sources/org.osbuild.files index 35a100ba..6d9fe8c1 100755 --- a/sources/org.osbuild.files +++ b/sources/org.osbuild.files @@ -94,6 +94,7 @@ def fetch(url, checksum, directory): # some mirrors are sometimes broken. retry manually, because we could be # redirected to a different, working, one on retry. start_time = time.monotonic() + return_code = 0 for _ in range(20): elapsed_time = time.monotonic() - start_time if elapsed_time >= 300: @@ -103,7 +104,6 @@ def fetch(url, checksum, directory): "--silent", "--max-time", f"{300 - elapsed_time}", "--connect-timeout", "60", - "--show-error", "--fail", "--location", "--output", checksum, @@ -119,10 +119,11 @@ def fetch(url, checksum, directory): curl_command.append(url_path) curl = subprocess.run(curl_command, encoding="utf-8", cwd=tmpdir, check=False) - if curl.returncode == 0: + return_code = curl.returncode + if return_code == 0: break else: - raise RuntimeError(f"error downloading {url}") + raise RuntimeError(f"curl: error downloading {url}: error code {return_code}") if not verify_checksum(f"{tmpdir}/{checksum}", checksum): raise RuntimeError(f"checksum mismatch: {checksum} {url}")