From f3a6db2f815b3646dfabec0f00216712668efa14 Mon Sep 17 00:00:00 2001
Message-Id: <f3a6db2f815b3646dfabec0f00216712668efa14.1532006891.git.lorenzo.bianconi@redhat.com>
In-Reply-To: <cover.1532006891.git.lorenzo.bianconi@redhat.com>
References: <cover.1532006891.git.lorenzo.bianconi@redhat.com>
From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Date: Thu, 19 Jul 2018 15:08:34 +0200
Subject: [PATCH] checkpatch: fix is_signature parsing

Fix following 'false-positive' errors reported by checkpatch.py
even if patch tags are properly formatted

ERROR: Too many signoffs; are you missing Co-authored-by lines?
ERROR: Co-authored-by/Signed-off-by corruption

   Co-authored-by: aginwala <aginwala@ebay.com>
   Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 utilities/checkpatch.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py
index f92971438..866d0b9c0 100755
--- a/utilities/checkpatch.py
+++ b/utilities/checkpatch.py
@@ -623,7 +623,7 @@ def ovs_checkpatch_parse(text, filename):
     hunks = re.compile('^(---|\+\+\+) (\S+)')
     hunk_differences = re.compile(
         r'^@@ ([0-9-+]+),([0-9-+]+) ([0-9-+]+),([0-9-+]+) @@')
-    is_signature = re.compile(r'^(Signed-off-by: )(.*)$',
+    is_signature = re.compile(r'^(Signed-off-by: |Co-authored-by: )(.*)$',
                               re.I | re.M | re.S)
     is_co_author = re.compile(r'^(Co-authored-by: )(.*)$',
                               re.I | re.M | re.S)
@@ -665,9 +665,9 @@ def ovs_checkpatch_parse(text, filename):
             elif is_signature.match(line):
                 m = is_signature.match(line)
                 signatures.append(m.group(2))
-            elif is_co_author.match(line):
-                m = is_co_author.match(line)
-                co_authors.append(m.group(2))
+                if is_co_author.match(line):
+                    m = is_co_author.match(line)
+                    co_authors.append(m.group(2))
             elif is_gerrit_change_id.match(line):
                 print_error(
                     "Remove Gerrit Change-Id's before submitting upstream.")
--
2.17.1