X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/34030e53ae0fd68c2d81eb5fd81053904a8ad387..0841a74bf82f59e316d8fbcfdff415bb003bc84e:/tools/helpers/http.py diff --git a/tools/helpers/http.py b/tools/helpers/http.py index 68031c3..2aac2b5 100644 --- a/tools/helpers/http.py +++ b/tools/helpers/http.py @@ -105,7 +105,7 @@ def download(args, url, prefix, cache=True, loglevel=logging.INFO, tools.helpers.run.user(args, ["rm", path]) # Download the file - logging.log(loglevel, "Download " + url) + logging.log(loglevel, "Downloading " + url) try: with urllib.request.urlopen(url) as response: with open(path, "wb") as handle: @@ -138,10 +138,13 @@ def retrieve(url, headers=None): if headers is None: headers = {} - req = urllib.request.Request(url, headers=headers) try: + req = urllib.request.Request(url, headers=headers) with urllib.request.urlopen(req) as response: return 200, response.read() + # Handle malformed URL + except ValueError as e: + return -1, "" # Handle 404 except urllib.error.HTTPError as e: return e.code, ""