Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
download_file.py: Synchronize curl options with gerrit core
Bazel: Make build tool chain forward compatible
Change-Id: Idf74d4ea125ae184e2dde82761b800cc15550f1b
diff --git a/tools/download_file.py b/tools/download_file.py
index ecf00de..534a6d5 100755
--- a/tools/download_file.py
+++ b/tools/download_file.py
@@ -103,7 +103,7 @@
print('Download %s' % src_url, file=stderr)
try:
- check_call(['curl', '--proxy-anyauth', '-ksfo', cache_ent, src_url])
+ check_call(['curl', '--proxy-anyauth', '-ksSfLo', cache_ent, src_url])
except OSError as err:
print('could not invoke curl: %s\nis curl installed?' % err, file=stderr)
exit(1)
diff --git a/tools/maven_jar.bzl b/tools/maven_jar.bzl
index 4c045e6..c4cae43 100644
--- a/tools/maven_jar.bzl
+++ b/tools/maven_jar.bzl
@@ -148,7 +148,7 @@
out = ctx.execute(args)
if out.return_code:
- fail("failed %s: %s" % (" ".join(args), out.stderr))
+ fail("failed %s: %s" % (args, out.stderr))
_generate_build_file(ctx, "jar", binjar)
if ctx.attr.src_sha1 or ctx.attr.attach_source:
