You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2016/12/16 00:15:54 UTC
spark git commit: [MINOR] Only rename SparkR tar.gz if names mismatch
Repository: spark
Updated Branches:
refs/heads/master 9c7f83b02 -> 9634018c4
[MINOR] Only rename SparkR tar.gz if names mismatch
## What changes were proposed in this pull request?
For release builds the R_PACKAGE_VERSION and VERSION are the same (e.g., 2.1.0). Thus `cp` throws an error which causes the build to fail.
## How was this patch tested?
Manually by executing the following script
```
set -o pipefail
set -e
set -x
touch a
R_PACKAGE_VERSION=2.1.0
VERSION=2.1.0
if [ "$R_PACKAGE_VERSION" != "$VERSION" ]; then
cp a a
fi
```
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Closes #16299 from shivaram/sparkr-cp-fix.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9634018c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9634018c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9634018c
Branch: refs/heads/master
Commit: 9634018c4d6d5a4f2c909f7227d91e637107b7f4
Parents: 9c7f83b
Author: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Authored: Thu Dec 15 16:15:51 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Dec 15 16:15:51 2016 -0800
----------------------------------------------------------------------
dev/make-distribution.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9634018c/dev/make-distribution.sh
----------------------------------------------------------------------
diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh
index 4da7d57..da44748 100755
--- a/dev/make-distribution.sh
+++ b/dev/make-distribution.sh
@@ -228,8 +228,8 @@ if [ "$MAKE_R" == "true" ]; then
# Install source package to get it to generate vignettes, etc.
# Do not source the check-cran.sh - it should be run from where it is for it to set SPARK_HOME
NO_TESTS=1 CLEAN_INSTALL=1 "$SPARK_HOME/"R/check-cran.sh
- # Make a copy of R source package matching the Spark release version.
- cp $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz $SPARK_HOME/R/SparkR_"$VERSION".tar.gz
+ # Move R source package to file name matching the Spark release version.
+ mv $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz $SPARK_HOME/R/SparkR_"$VERSION".tar.gz
popd > /dev/null
else
echo "Skipping building R source package"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org