diff options
| author | Tom Rini <trini@ti.com> | 2014-05-09 18:48:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-09 18:48:26 -0400 |
| commit | f4617ef86dbbc2b844d530564694b927099bf0a9 (patch) | |
| tree | 33dd41efabe14ad2ce99559f556fa6f22841f8a5 /tools/patman/patchstream.py | |
| parent | bcb879c0e37db1cf527ff408df93918f155012ea (diff) | |
| parent | 097c5de5f4a64d3b121dc1dbe020f7f2545dabdb (diff) | |
Merge branch 'tom' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'tools/patman/patchstream.py')
| -rw-r--r-- | tools/patman/patchstream.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index c4017e0e6d..9f5682cd0f 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -21,7 +21,7 @@ re_remove = re.compile('^BUG=|^TEST=|^BRANCH=|^Change-Id:|^Review URL:' re_allowed_after_test = re.compile('^Signed-off-by:') # Signoffs -re_signoff = re.compile('^Signed-off-by:') +re_signoff = re.compile('^Signed-off-by: *(.*)') # The start of the cover letter re_cover = re.compile('^Cover-letter:') @@ -159,6 +159,7 @@ class PatchStream: commit_tag_match = re_commit_tag.match(line) commit_match = re_commit.match(line) if self.is_log else None cover_cc_match = re_cover_cc.match(line) + signoff_match = re_signoff.match(line) tag_match = None if self.state == STATE_PATCH_HEADER: tag_match = re_tag.match(line) @@ -223,7 +224,7 @@ class PatchStream: if is_blank: # Blank line ends this change list self.in_change = 0 - elif line == '---' or re_signoff.match(line): + elif line == '---': self.in_change = 0 out = self.ProcessLine(line) else: @@ -272,6 +273,11 @@ class PatchStream: else: self.tags.append(line); + # Suppress duplicate signoffs + elif signoff_match: + if self.commit.CheckDuplicateSignoff(signoff_match.group(1)): + out = [line] + # Well that means this is an ordinary line else: pos = 1 |