diff options
author | Steven R. Loomis <srloomis@us.ibm.com> | 2018-10-17 09:41:07 -0700 |
---|---|---|
committer | Steven R. Loomis <srloomis@us.ibm.com> | 2018-10-24 08:27:19 -0700 |
commit | d8f2d2726143ecfbf99b90b7bbbc6f41b3cd95fc (patch) | |
tree | c6f660ee820b493b5c37142d5ba4aec364c080e1 /tools/configure.d | |
parent | 5d80ae3acdd812651b3b193cd31e0b81c214b50e (diff) | |
download | android-node-v8-d8f2d2726143ecfbf99b90b7bbbc6f41b3cd95fc.tar.gz android-node-v8-d8f2d2726143ecfbf99b90b7bbbc6f41b3cd95fc.tar.bz2 android-node-v8-d8f2d2726143ecfbf99b90b7bbbc6f41b3cd95fc.zip |
tools, icu: actually failover if there are multiple URLs
Building on #23269, if multiple ICU download URLs are present, try the
next one in case of error.
Part of the ICU 63.1 bump, but independent code-wise.
https://github.com/nodejs/node/issues/23244
PR-URL: https://github.com/nodejs/node/pull/23715
Fixes: https://github.com/nodejs/node/issues/22344
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'tools/configure.d')
-rw-r--r-- | tools/configure.d/nodedownload.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tools/configure.d/nodedownload.py b/tools/configure.d/nodedownload.py index 3f4bc090f7..e3fe2c517c 100644 --- a/tools/configure.d/nodedownload.py +++ b/tools/configure.d/nodedownload.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # Moved some utilities here from ../../configure +from __future__ import print_function import urllib import hashlib import sys @@ -36,10 +37,13 @@ def retrievefile(url, targetfile): sys.stdout.write(' <%s>\nConnecting...\r' % url) sys.stdout.flush() ConfigOpener().retrieve(url, targetfile, reporthook=reporthook) - print '' # clear the line + print('') # clear the line return targetfile + except IOError as err: + print(' ** IOError %s\n' % err) + return None except: - print ' ** Error occurred while downloading\n <%s>' % url + print(' ** Error occurred while downloading\n <%s>' % url) raise def md5sum(targetfile): @@ -56,12 +60,12 @@ def unpack(packedfile, parent_path): """Unpacks packedfile into parent_path. Assumes .zip. Returns parent_path""" if zipfile.is_zipfile(packedfile): with contextlib.closing(zipfile.ZipFile(packedfile, 'r')) as icuzip: - print ' Extracting zipfile: %s' % packedfile + print(' Extracting zipfile: %s' % packedfile) icuzip.extractall(parent_path) return parent_path elif tarfile.is_tarfile(packedfile): with contextlib.closing(tarfile.TarFile.open(packedfile, 'r')) as icuzip: - print ' Extracting tarfile: %s' % packedfile + print(' Extracting tarfile: %s' % packedfile) icuzip.extractall(parent_path) return parent_path else: @@ -112,7 +116,7 @@ def parse(opt): theRet[anOpt] = True else: # future proof: ignore unknown types - print 'Warning: ignoring unknown --download= type "%s"' % anOpt + print('Warning: ignoring unknown --download= type "%s"' % anOpt) # all done return theRet @@ -122,6 +126,6 @@ def candownload(auto_downloads, package): if auto_downloads[package]: return True else: - print """Warning: Not downloading package "%s". You could pass "--download=all" - (Windows: "download-all") to try auto-downloading it.""" % package + print("""Warning: Not downloading package "%s". You could pass "--download=all" + (Windows: "download-all") to try auto-downloading it.""" % package) return False |