From 4caae5b30a8b0f7e615fe8e238d9e379e256c934 Mon Sep 17 00:00:00 2001 From: glx22 Date: Tue, 30 Apr 2024 22:05:36 +0200 Subject: [PATCH] Fix: don't crash when backporting non-merged PRs --- backport/backport.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backport/backport.py b/backport/backport.py index b65e6c7..40c76d5 100644 --- a/backport/backport.py +++ b/backport/backport.py @@ -173,6 +173,11 @@ def main(): print("ERROR: couldn't fetch all Pull Requests marked for 'backport requested'") return + for pr in all_prs["data"]["search"]["edges"]: + if pr["node"]["mergedAt"] is None: + print(f"ERROR: #{pr['node']['number']} is marked for 'backport requested' while not merged") + return + if not resume: do_command(["git", "fetch", "upstream"]) do_command(["git", "checkout", f"upstream/release/{RELEASE}", "-B", "release-backport"])