Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit ae853e8

Browse files
shivaramrxin
authored andcommitted
[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 <[email protected]> Closes apache#16299 from shivaram/sparkr-cp-fix. (cherry picked from commit 9634018) Signed-off-by: Reynold Xin <[email protected]>
1 parent 08e4272 commit ae853e8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

dev/make-distribution.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ if [ "$MAKE_R" == "true" ]; then
228228
# Install source package to get it to generate vignettes, etc.
229229
# Do not source the check-cran.sh - it should be run from where it is for it to set SPARK_HOME
230230
NO_TESTS=1 CLEAN_INSTALL=1 "$SPARK_HOME/"R/check-cran.sh
231-
# Make a copy of R source package matching the Spark release version.
232-
cp $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz $SPARK_HOME/R/SparkR_"$VERSION".tar.gz
231+
# Move R source package to file name matching the Spark release version.
232+
mv $SPARK_HOME/R/SparkR_"$R_PACKAGE_VERSION".tar.gz $SPARK_HOME/R/SparkR_"$VERSION".tar.gz
233233
popd > /dev/null
234234
else
235235
echo "Skipping building R source package"

0 commit comments

Comments
 (0)