From 905504852e2f1ebba68596d36de5c1a0bd0f15cb Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 13 Apr 2020 09:46:15 -0700 Subject: [PATCH] build: improve patch filename remembering (#23070) --- script/lib/patches.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/lib/patches.py b/script/lib/patches.py index c3035b88e5eed..2365303de0cbd 100644 --- a/script/lib/patches.py +++ b/script/lib/patches.py @@ -8,11 +8,13 @@ def read_patch(patch_dir, patch_filename): """Read a patch from |patch_dir/filename| and amend the commit message with metadata about the patch file it came from.""" ret = [] + added_filename_line = False patch_path = os.path.join(patch_dir, patch_filename) with codecs.open(patch_path, encoding='utf-8') as f: for l in f.readlines(): - if l.startswith('diff -'): + if not added_filename_line and (l.startswith('diff -') or l.startswith('---')): ret.append('Patch-Filename: {}\n'.format(patch_filename)) + added_filename_line = True ret.append(l) return ''.join(ret)