[spark] branch branch-3.0 updated: [SPARK-31979] Release script should not fail when remove non-existing files

[do...@apache.org]

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

dongjoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 758c5b1  [SPARK-31979] Release script should not fail when remove non-existing files
758c5b1 is described below

commit 758c5b1b0528d8038662720ffd871b58f3e13609
Author: Wenchen Fan <we...@databricks.com>
AuthorDate: Fri Jun 12 11:06:52 2020 -0700

    [SPARK-31979] Release script should not fail when remove non-existing files
    
    ### What changes were proposed in this pull request?
    
    When removing non-existing files in the release script, do not fail.
    
    ### Why are the changes needed?
    
    This is to make the release script more robust, as we don't care if the files exist before we remove them.
    
    ### Does this PR introduce _any_ user-facing change?
    
    no
    
    ### How was this patch tested?
    
    tested when cutting 3.0.0 RC
    
    Closes #28815 from cloud-fan/release.
    
    Authored-by: Wenchen Fan <we...@databricks.com>
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
    (cherry picked from commit 28f131fc8a4bbabb2d0bca3c46418b78c8ba3e1d)
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 dev/create-release/release-build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh
index e3bcb72..eb97258 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -164,7 +164,7 @@ fi
 DEST_DIR_NAME="$SPARK_PACKAGE_VERSION"
 
 git clean -d -f -x
-rm .gitignore
+rm -f .gitignore
 cd ..
 
 if [[ "$1" == "package" ]]; then
@@ -174,9 +174,9 @@ if [[ "$1" == "package" ]]; then
 
   # For source release in v2.4+, exclude copy of binary license/notice
   if [[ $SPARK_VERSION > "2.4" ]]; then
-    rm spark-$SPARK_VERSION/LICENSE-binary
-    rm spark-$SPARK_VERSION/NOTICE-binary
-    rm -r spark-$SPARK_VERSION/licenses-binary
+    rm -f spark-$SPARK_VERSION/LICENSE-binary
+    rm -f spark-$SPARK_VERSION/NOTICE-binary
+    rm -rf spark-$SPARK_VERSION/licenses-binary
   fi
 
   tar cvzf spark-$SPARK_VERSION.tgz --exclude spark-$SPARK_VERSION/.git spark-$SPARK_VERSION


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org