tools/helpers/http.py: also handle urllib.error.URLError exceptions instead of showin...

[waydroid.git] / tools / helpers / http.py

diff --git a/tools/helpers/http.py b/tools/helpers/http.py
index 68031c35a5abbf22c94094ccb6b58f478b95af52..e0533701f46645b932926be0c81356311c163c0b 100644 (file)
--- 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,15 @@ 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, ""
+    except urllib.error.URLError as e:
+        return -2, ""