From 28ef05ce1084822c46f95c91de78435b15c5f9b0 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 7 Jul 2021 17:01:57 -0700 Subject: [PATCH] BaseTools/Scripts: Allow GitHub ID at end Maintainers.txt lines * Update GetMaintainer.py to support an optional GitHub ID at the end of maintainer and reviewer lines. * Remove contents after email address from standard output * Fix minor issue in --lookup to convert file path separators from '\' to '/' to be compatible with regular expression file matching. Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Signed-off-by: Michael D Kinney Reviewed-by: Bob Feng --- BaseTools/Scripts/GetMaintainer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMaintainer.py index 5ec851554d..d1e042c0af 100644 --- a/BaseTools/Scripts/GetMaintainer.py +++ b/BaseTools/Scripts/GetMaintainer.py @@ -18,7 +18,7 @@ EXPRESSIONS = { 'exclude': re.compile(r'^X:\s*(?P.*?)\r*$'), 'file': re.compile(r'^F:\s*(?P.*?)\r*$'), 'list': re.compile(r'^L:\s*(?P.*?)\r*$'), - 'maintainer': re.compile(r'^M:\s*(?P.*<.*?>)\r*$'), + 'maintainer': re.compile(r'^M:\s*(?P.*?)\r*$'), 'reviewer': re.compile(r'^R:\s*(?P.*?)\r*$'), 'status': re.compile(r'^S:\s*(?P.*?)\r*$'), 'tree': re.compile(r'^T:\s*(?P.*?)\r*$'), @@ -178,7 +178,7 @@ if __name__ == '__main__': SECTIONS = parse_maintainers_file(CONFIG_FILE) if ARGS.lookup: - FILES = [ARGS.lookup] + FILES = [ARGS.lookup.replace('\\','/')] else: FILES = get_modified_files(REPO, ARGS) @@ -191,4 +191,6 @@ if __name__ == '__main__': ADDRESSES += addresslist for address in list(OrderedDict.fromkeys(ADDRESSES)): + if '<' in address and '>' in address: + address = address.split('>', 1)[0] + '>' print(' %s' % address)