From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 5 Nov 2019 15:51:31 +0000 (+0100)
Subject: ceph-backport.sh: --existing-pr ... --force should update PR body
X-Git-Tag: v15.1.0~963^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50b21702b76948ddf98e75d0e652eb3b4a442437;p=ceph.git

ceph-backport.sh: --existing-pr ... --force should update PR body

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/script/ceph-backport.sh b/src/script/ceph-backport.sh
index d2f968a33654..b4d747f21466 100755
--- a/src/script/ceph-backport.sh
+++ b/src/script/ceph-backport.sh
@@ -373,9 +373,16 @@ function existing_pr_routine {
     redmine_url_without_scheme="${redmine_url//http?:\/\//}"
     verbose "Redmine URL without scheme: $redmine_url_without_scheme"
     if [[ "$clipped_pr_body" =~ $redmine_url_without_scheme ]] ; then
-        verbose "Existing backport PR ${backport_pr_number} mentions $redmine_url"
+        info "Existing backport PR ${backport_pr_number} already mentions $redmine_url"
+        if [ "$FORCE" ] ; then
+            warning "--force was given, so updating the PR body anyway"
+            update_pr_body="yes"
+        fi
     else
         warning "Existing backport PR ${backport_pr_number} does NOT mention $redmine_url - adding it"
+        update_pr_body="yes"
+    fi
+    if [ "$update_pr_body" ] ; then
         new_pr_body="backport tracker: ${redmine_url}"
         if [ "${original_pr_url}" ] ; then
             new_pr_body="${new_pr_body}