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. #23244 PR-URL: #23715Fixes: #22344 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Michael Dawson <[email protected]>

Author: srl295

configure.py

@@ -1312,8 +1312,8 @@ def icu_download(path):
 if (md5==gotmd5):
 returntargetfile
 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)
 returnNone
 icu_config={
 'variables':{}
@@ -1462,11 +1462,12 @@ def write_config(data, name):
 # ICU source dir relative to tools/icu (for .gyp file)
 o['variables']['icu_path'] =icu_full_path
 ifnotos.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)
 iflocalzip:
 nodedownload.unpack(localzip, icu_parent_path)
+else:
+warn('* ECMA-402 (Intl) support didn\'t find ICU in %s..'%icu_full_path)
 ifnotos.path.isdir(icu_full_path):
 error('''Cannot build Intl without ICU in %s.
  Fix, or disable with "--with-intl=none"'''%icu_full_path)

tools/configure.d/nodedownload.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # Moved some utilities here from ../../configure
 
+from __future__ importprint_function
 importurllib
 importhashlib
 importsys
@@ -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
 returntargetfile
+exceptIOErroraserr:
+print(' ** IOError %s\n'%err)
+returnNone
 except:
-print' ** Error occurred while downloading\n <%s>'%url
+print(' ** Error occurred while downloading\n <%s>'%url)
 raise
 
 defmd5sum(targetfile):
@@ -56,12 +60,12 @@ def unpack(packedfile, parent_path):
 """Unpacks packedfile into parent_path. Assumes .zip. Returns parent_path"""
 ifzipfile.is_zipfile(packedfile):
 withcontextlib.closing(zipfile.ZipFile(packedfile, 'r')) asicuzip:
-print' Extracting zipfile: %s'%packedfile
+print(' Extracting zipfile: %s'%packedfile)
 icuzip.extractall(parent_path)
 returnparent_path
 eliftarfile.is_tarfile(packedfile):
 withcontextlib.closing(tarfile.TarFile.open(packedfile, 'r')) asicuzip:
-print' Extracting tarfile: %s'%packedfile
+print(' Extracting tarfile: %s'%packedfile)
 icuzip.extractall(parent_path)
 returnparent_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
 returntheRet
 
@@ -122,6 +126,6 @@ def candownload(auto_downloads, package):
 ifauto_downloads[package]:
 returnTrue
 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)
 returnFalse