colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

find-backports: fix Ignore-Fixes detection

Browse Source 
The regex for "Fixes" also matches with "Ignore-Fixes", so the commit is
added twice and then removed only once by the "Ignore-Fixes". It still
remains once in the list of commits to backport, making that
"Ignore-Fixes" does not work. Fix it.
This commit is contained in:
Íñigo Huguet
2024-12-23 12:27:27 +01:00
parent 3caf7178b9
commit 248addcc22
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/scripts/find-backports
View File

@@ -193,7 +193,7 @@ def git_ref_commit_body(ref):
def git_ref_commit_body_get_fixes(ref): def git_ref_commit_body_get_fixes(ref):
body = git_ref_commit_body(ref) body = git_ref_commit_body(ref)
result = [] 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") c = mo.group(1).decode("ascii")
h = git_ref_exists(c) h = git_ref_exists(c)
if h: if h:
@@ -202,7 +202,7 @@ def git_ref_commit_body_get_fixes(ref):
# The commit that contains a "Fixes:" line, can also contain an "Ignore-Fixes:" line # 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 # to disable it. This only makes sense with refs/notes/bugs notes, to fix up a wrong
# annotation. # 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") c = mo.group(1).decode("ascii")
h = git_ref_exists(c) h = git_ref_exists(c)
try: try: