script/backport-resolve-issue: fix script to handle RC versions

Fixes: https://tracker.ceph.com/issues/61746
Signed-off-by: Zhelong Zhao <zztaki@outlook.com>
Signed-off-by: Zhelong Zhao <50295684+zztaki@users.noreply.github.com>

diff --git a/src/script/backport-resolve-issue b/src/script/backport-resolve-issue
index b8f1d8be269e42e33c1ca9784d9f8f5839000132..a153fa778a13312bdf7d133ad07fb7a8a4dcdcef 100755 (executable)
--- a/src/script/backport-resolve-issue
+++ b/src/script/backport-resolve-issue
@@ -522,7 +522,10 @@ Ceph version:     base {}, target {}'''
         maybe_stable = "v{}.{}".format(x, y)
         assert ver_to_release()[maybe_stable], \
             "SHA1 {} is not based on any known stable release ({})".format(sha1, maybe_stable)
-        tv = "v{}.{}.{}".format(x, y, int(z) + 1)
+        if int(y) == 0:
+            tv = "v{}.{}.{}".format(x, 1, z)
+        else:
+            tv = "v{}.{}.{}".format(x, y, int(z) + 1)
         if tv in version2version_id:
             self.target_version = tv
         else: