In the MAINTAINERS file, names and emails are separated by tabs.  One of
the entries recently added used spaces.  This patch corrects this.

The check-MAINTAINERS.py script breaks a bit when this happens.  This
patch also adds warning about this situation into the script.

ChangeLog:

        * MAINTAINERS: Use tabs between name and email.

contrib/ChangeLog:

        * check-MAINTAINERS.py: Add warning about not using tabs.

Signed-off-by: Filip Kastl <fka...@suse.cz>
---
 MAINTAINERS                  | 2 +-
 contrib/check-MAINTAINERS.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 361059fd55c..8bb435dd54e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -738,7 +738,7 @@ Kwok Cheung Yeung                           
<kcye...@baylibre.com>
 Greta Yorsh                                    <greta.yo...@arm.com>
 David Yuste                                    <david.yu...@gmail.com>
 Adhemerval Zanella                             <azane...@linux.vnet.ibm.com>
-Xiao Zeng                                       <zengx...@eswincomputing.com>
+Xiao Zeng                                      <zengx...@eswincomputing.com>
 Dennis Zhang                                   <dennis.zh...@arm.com>
 Yufeng Zhang                                   <yufeng.zh...@arm.com>
 Qing Zhao                                      <qing.z...@oracle.com>
diff --git a/contrib/check-MAINTAINERS.py b/contrib/check-MAINTAINERS.py
index 9f31a10bcff..2bac67f0821 100755
--- a/contrib/check-MAINTAINERS.py
+++ b/contrib/check-MAINTAINERS.py
@@ -71,6 +71,14 @@ def check_group(name, lines):
             print(f'Line should not start with space: "{line}"')
             exit_code = 2
 
+        # Special-case some names
+        if line == 'James Norris':
+            continue
+
+        if '\t' not in line:
+            print(f'Name and email should be separated by tabs: "{line}"')
+            exit_code = 2
+
     lines = [line + '\n' for line in lines]
     sorted_lines = sorted(lines, key=sort_by_surname)
     if lines != sorted_lines:
-- 
2.45.0

Reply via email to