diff --git a/wrap.py b/wrap.py index c6c730cf7..e01dfe8a4 100644 --- a/wrap.py +++ b/wrap.py @@ -17,7 +17,7 @@ import urllib.request, os, hashlib, shutil import subprocess import sys -from wraptool import build_ssl_context +import wraptool class PackageDefinition: def __init__(self, fname): @@ -94,7 +94,7 @@ class Resolver: def get_data(self, url): blocksize = 10*1024 if url.startswith('https://wrapdb.mesonbuild.com'): - resp = urllib.request.urlopen(url, context=build_ssl_context()) + resp = wraptool.open_wrapdburl(url) else: resp = urllib.request.urlopen(url) dlsize = int(resp.info()['Content-Length']) diff --git a/wraptool.py b/wraptool.py index 9d4ca9336..ecb289999 100755 --- a/wraptool.py +++ b/wraptool.py @@ -112,6 +112,10 @@ def open_wrapdburl(urlstring): print('Warning: ssl not available, traffic not authenticated.', file=sys.stderr) ssl_warning_printed = True + # Trying to open SSL connection to wrapdb fails because the + # certificate is not known. Use plain http. For some + # reason OSX fails here again. + urlstring = 'http' + urlstring[5:] return urllib.request.urlopen(urlstring) def get_result(urlstring):