You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2015/02/05 21:03:16 UTC
spark git commit: [SPARK-5474][Build]curl should support URL
redirection in build/mvn
Repository: spark
Updated Branches:
refs/heads/master 4d74f0601 -> 34147549a
[SPARK-5474][Build]curl should support URL redirection in build/mvn
Author: GuoQiang Li <wi...@qq.com>
Closes #4263 from witgo/SPARK-5474 and squashes the following commits:
ef397ff [GuoQiang Li] review commits
a398324 [GuoQiang Li] curl should support URL redirection in build/mvn
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/34147549
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/34147549
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/34147549
Branch: refs/heads/master
Commit: 34147549a7ad188e5eae8d818d36ca0fe882c16f
Parents: 4d74f06
Author: GuoQiang Li <wi...@qq.com>
Authored: Thu Feb 5 12:03:13 2015 -0800
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Thu Feb 5 12:03:13 2015 -0800
----------------------------------------------------------------------
build/mvn | 10 +++++-----
dev/check-license | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/34147549/build/mvn
----------------------------------------------------------------------
diff --git a/build/mvn b/build/mvn
index a87c5a2..53babf5 100755
--- a/build/mvn
+++ b/build/mvn
@@ -34,14 +34,14 @@ install_app() {
local binary="${_DIR}/$3"
# setup `curl` and `wget` silent options if we're running on Jenkins
- local curl_opts=""
+ local curl_opts="-L"
local wget_opts=""
if [ -n "$AMPLAB_JENKINS" ]; then
- curl_opts="-s"
- wget_opts="--quiet"
+ curl_opts="-s ${curl_opts}"
+ wget_opts="--quiet ${wget_opts}"
else
- curl_opts="--progress-bar"
- wget_opts="--progress=bar:force"
+ curl_opts="--progress-bar ${curl_opts}"
+ wget_opts="--progress=bar:force ${wget_opts}"
fi
if [ -z "$3" -o ! -f "$binary" ]; then
http://git-wip-us.apache.org/repos/asf/spark/blob/34147549/dev/check-license
----------------------------------------------------------------------
diff --git a/dev/check-license b/dev/check-license
index a006f65..39943f8 100755
--- a/dev/check-license
+++ b/dev/check-license
@@ -31,7 +31,7 @@ acquire_rat_jar () {
printf "Attempting to fetch rat\n"
JAR_DL="${JAR}.part"
if [ $(command -v curl) ]; then
- curl --silent "${URL}" > "$JAR_DL" && mv "$JAR_DL" "$JAR"
+ curl -L --silent "${URL}" > "$JAR_DL" && mv "$JAR_DL" "$JAR"
elif [ $(command -v wget) ]; then
wget --quiet ${URL} -O "$JAR_DL" && mv "$JAR_DL" "$JAR"
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org