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 /configure.py | |
| parent | 5d80ae3acdd812651b3b193cd31e0b81c214b50e (diff) | |
| download | node-new-d8f2d2726143ecfbf99b90b7bbbc6f41b3cd95fc.tar.gz | |
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 'configure.py')
| -rwxr-xr-x | configure.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 37f6058c6e..5bc53630f3 100755 --- a/configure.py +++ b/configure.py @@ -1287,8 +1287,8 @@ def configure_intl(o): if (md5 == gotmd5): return targetfile else: - error('Expected: %s *MISMATCH*' % md5) - error('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile) + warn('Expected: %s *MISMATCH*' % md5) + warn('\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile) return None icu_config = { 'variables': {} @@ -1432,11 +1432,12 @@ def configure_intl(o): # ICU source dir relative to tools/icu (for .gyp file) o['variables']['icu_path'] = icu_full_path if not os.path.isdir(icu_full_path): - warn('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % icu_full_path) # can we download (or find) a zipfile? localzip = icu_download(icu_full_path) if localzip: nodedownload.unpack(localzip, icu_parent_path) + else: + warn('* ECMA-402 (Intl) support didn\'t find ICU in %s..' % icu_full_path) if not os.path.isdir(icu_full_path): error('''Cannot build Intl without ICU in %s. Fix, or disable with "--with-intl=none"''' % icu_full_path) |