[arrow] branch master updated: ARROW-5214: [C++] Fix thirdparty download script

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 02bd2a8  ARROW-5214: [C++] Fix thirdparty download script
02bd2a8 is described below

commit 02bd2a890b9b715e4efa7d003dbf26bd419036ee
Author: François Saint-Jacques <fs...@gmail.com>
AuthorDate: Fri Apr 26 10:44:11 2019 -0500

    ARROW-5214: [C++] Fix thirdparty download script
    
    - Some URI changed
    - Switched wget option from `--quiet` to `--no-verbose` for improved
      error messages. Sadly this will clutter stderr sometimes with non
      failure error, thus manual copy-paste will be hindered, but not inline
      eval, e.g. `eval $(download.. )`.
    
    Author: François Saint-Jacques <fs...@gmail.com>
    
    Closes #4214 from fsaintjacques/ARROW-5214-thirdparty-download and squashes the following commits:
    
    aaacc3b69 <François Saint-Jacques> Ensure error goes to stderr
    de3540ab3 <François Saint-Jacques> Be more verbose on failure
    a521d07b3 <François Saint-Jacques> ARROW-5214:  Fix thirdparty download script
---
 cpp/thirdparty/download_dependencies.sh | 5 ++---
 cpp/thirdparty/versions.txt             | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cpp/thirdparty/download_dependencies.sh b/cpp/thirdparty/download_dependencies.sh
index f782963..7ffffa0 100755
--- a/cpp/thirdparty/download_dependencies.sh
+++ b/cpp/thirdparty/download_dependencies.sh
@@ -36,9 +36,8 @@ download_dependency() {
   local url=$1
   local out=$2
 
-  # --show-progress will not output to stdout, it is safe to pipe the result of
-  # the script into eval.
-  wget --quiet --continue --output-document="${out}" "${url}"
+  wget --quiet --continue --output-document="${out}" "${url}" || \
+    (echo "Failed downloading ${url}" 1>&2; exit 1)
 }
 
 main() {
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 5afd4f6..c7d0997 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -69,9 +69,9 @@ DEPENDENCIES=(
   "ARROW_PROTOBUF_URL protobuf-${PROTOBUF_VERSION}.tar.gz https://github.com/google/protobuf/releases/download/${PROTOBUF_VERSION}/protobuf-all-${PROTOBUF_VERSION:1}.tar.gz"
   "ARROW_RAPIDJSON_URL rapidjson-${RAPIDJSON_VERSION}.tar.gz https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_VERSION}.tar.gz"
   "ARROW_RE2_URL re2-${RE2_VERSION}.tar.gz https://github.com/google/re2/archive/${RE2_VERSION}.tar.gz"
-  "ARROW_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/releases/download/${SNAPPY_VERSION}/snappy-${SNAPPY_VERSION}.tar.gz"
+  "ARROW_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz"
   "ARROW_THRIFT_URL thrift-${THRIFT_VERSION}.tar.gz http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz"
-  "ARROW_URIPARSER_URL uriparser-${URIPARSER_VERSION}.tar.gz https://github.com/uriparser/uriparser/archive/${URIPARSER_VERSION}.tar.gz"
+  "ARROW_URIPARSER_URL uriparser-${URIPARSER_VERSION}.tar.gz https://github.com/uriparser/uriparser/archive/uriparser-${URIPARSER_VERSION}.tar.gz"
   "ARROW_ZLIB_URL zlib-${ZLIB_VERSION}.tar.gz http://zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz"
   "ARROW_ZSTD_URL zstd-${ZSTD_VERSION}.tar.gz https://github.com/facebook/zstd/archive/${ZSTD_VERSION}.tar.gz"
 )