summaryrefslogtreecommitdiffstats
path: root/BaseTools/Scripts
diff options
context:
space:
mode:
authorMichael D Kinney <michael.d.kinney@intel.com>2021-07-07 17:01:57 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-07-22 07:06:48 +0000
commit28ef05ce1084822c46f95c91de78435b15c5f9b0 (patch)
tree38b54da0b2baeb347bb215d9ace119aaf0910151 /BaseTools/Scripts
parent8781b143dea610ac568bf1c392ccdf9dc5659ee9 (diff)
downloadedk2-28ef05ce1084822c46f95c91de78435b15c5f9b0.tar.gz
edk2-28ef05ce1084822c46f95c91de78435b15c5f9b0.tar.bz2
edk2-28ef05ce1084822c46f95c91de78435b15c5f9b0.zip
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 <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Diffstat (limited to 'BaseTools/Scripts')
-rw-r--r--BaseTools/Scripts/GetMaintainer.py6
1 files 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<exclude>.*?)\r*$'),
'file': re.compile(r'^F:\s*(?P<file>.*?)\r*$'),
'list': re.compile(r'^L:\s*(?P<list>.*?)\r*$'),
- 'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*<.*?>)\r*$'),
+ 'maintainer': re.compile(r'^M:\s*(?P<maintainer>.*?)\r*$'),
'reviewer': re.compile(r'^R:\s*(?P<reviewer>.*?)\r*$'),
'status': re.compile(r'^S:\s*(?P<status>.*?)\r*$'),
'tree': re.compile(r'^T:\s*(?P<tree>.*?)\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)