aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/wrap
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-01-16 21:58:15 -0500
committerXavier Claessens <xclaesse@gmail.com>2020-01-17 11:36:37 -0500
commit711969c3b50383c7d6fe6eec3b945a35ad88ab71 (patch)
treeb4376d882d8e22c6b3a943d1e1f2d6fa2fc9a2c1 /mesonbuild/wrap
parentb092aaff067cb50fce1f5a87edeb8636128f1b87 (diff)
downloadmeson-711969c3b50383c7d6fe6eec3b945a35ad88ab71.zip
meson-711969c3b50383c7d6fe6eec3b945a35ad88ab71.tar.gz
meson-711969c3b50383c7d6fe6eec3b945a35ad88ab71.tar.bz2
wrap: Fix support of file:// URLs
Fixes: #6445
Diffstat (limited to 'mesonbuild/wrap')
-rw-r--r--mesonbuild/wrap/wrap.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index abbeb9e..0ebc2bc 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -335,9 +335,7 @@ class Resolver:
h = hashlib.sha256()
tmpfile = tempfile.NamedTemporaryFile(mode='wb', dir=self.cachedir, delete=False)
url = urllib.parse.urlparse(urlstring)
- if not url.hostname:
- raise WrapException('{} is not a valid URL'.format(urlstring))
- if url.hostname.endswith(whitelist_subdomain):
+ if url.hostname and url.hostname.endswith(whitelist_subdomain):
resp = open_wrapdburl(urlstring)
elif whitelist_subdomain in urlstring:
raise WrapException('{} may be a WrapDB-impersonating URL'.format(urlstring))