New upstream version 1.50.1 upstream/1.50.1

1 files changed, 6 insertions, 2 deletions

diff --git a/contrib/scripts/find-backports b/contrib/scripts/find-backports
index c2082570..92116892 100755
--- a/contrib/scripts/find-backports
+++ b/contrib/scripts/find-backports
@@ -193,7 +193,9 @@ def git_ref_commit_body(ref):
 def git_ref_commit_body_get_fixes(ref):
     body = git_ref_commit_body(ref)
     result = []
-    for mo in re.finditer(re_bin("\\b[fF]ixes: *([0-9a-z]+)\\b"), body):
+    for mo in re.finditer(
+        re_bin("^\\s*[fF]ixes: *([0-9a-z]+)\\b"), body, flags=re.MULTILINE
+    ):
         c = mo.group(1).decode("ascii")
         h = git_ref_exists(c)
         if h:
@@ -202,7 +204,9 @@ def git_ref_commit_body_get_fixes(ref):
         # The commit that contains a "Fixes:" line, can also contain an "Ignore-Fixes:" line
         # to disable it. This only makes sense with refs/notes/bugs notes, to fix up a wrong
         # annotation.
-        for mo in re.finditer(re_bin("\\bIgnore-[fF]ixes: *([0-9a-z]+)\\b"), body):
+        for mo in re.finditer(
+            re_bin("^\\s*Ignore-[fF]ixes: *([0-9a-z]+)\\b"), body, flags=re.MULTILINE
+        ):
             c = mo.group(1).decode("ascii")
             h = git_ref_exists(c)
             try: