From 4f70f5bd7cbd79e54d8c37a53267eae62a633c36 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Fri, 8 Dec 2023 16:31:46 +0100 Subject: [PATCH] Handle empty MR description in dangerfile A merge request might have no description at all (i.e. None, rather than an empty string). This might happen when the MR is created via an API. Check a description is present before trying to find a backport string in it. --- dangerfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dangerfile.py b/dangerfile.py index 531e05bb18..2c1e7de14c 100644 --- a/dangerfile.py +++ b/dangerfile.py @@ -186,7 +186,6 @@ BACKPORT_OF_RE = re.compile( r"Backport\s+of.*(merge_requests/|!)([0-9]+)", flags=re.IGNORECASE ) VERSION_LABEL_RE = re.compile(r"v9.([0-9]+)(-S)?") -backport_desc = BACKPORT_OF_RE.search(danger.gitlab.mr.description) version_labels = [l for l in mr_labels if l.startswith("v9.")] affects_labels = [l for l in mr_labels if l.startswith("Affects v9.")] if is_backport: @@ -205,6 +204,7 @@ if is_backport: "Backport MRs must have their target version in the title. " f"Please put `[9.{minor_ver}{edition}]` at the start of the MR title." ) + backport_desc = BACKPORT_OF_RE.search(danger.gitlab.mr.description or "") if backport_desc is None: fail( "Backport MRs must link to the original MR. Please put "