From 8ef771d4865f38a63e185a3d5e6b9832166f669e Mon Sep 17 00:00:00 2001 From: Zhelong Zhao <50295684+zztaki@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:29:34 +0800 Subject: [PATCH] script/backport-resolve-issue: fix script to handle RC versions Fixes: https://tracker.ceph.com/issues/61746 Signed-off-by: Zhelong Zhao Signed-off-by: Zhelong Zhao <50295684+zztaki@users.noreply.github.com> --- src/script/backport-resolve-issue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/script/backport-resolve-issue b/src/script/backport-resolve-issue index b8f1d8be269e..a153fa778a13 100755 --- 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: -- 2.47.3