diff options
| author | Martin Liska <mliska@suse.cz> | 2019-11-08 09:39:17 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-11-08 08:39:17 +0000 |
| commit | 617c564bf04a3b183703c2be725b3243766dfeb5 (patch) | |
| tree | bcbe78f46578ddc5bfd0ff4f2f2d34db6d3db506 /contrib | |
| parent | 69a5dd57325484add5531a8c72399786f14b2ccd (diff) | |
Make mklog more robust.
2019-11-08 Martin Liska <mliska@suse.cz>
* mklog: The script fails for patches that contain:
'---param=foo=bar xyz'.
From-SVN: r277952
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/mklog | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 5f62e8bf8d6..f6b353959b4 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2019-11-08 Martin Liska <mliska@suse.cz> + + * mklog: The script fails for patches that contain: + '---param=foo=bar xyz'. + 2019-09-18 Martin Liska <mliska@suse.cz> * clang-format: Tweak configuration based on new diff --git a/contrib/mklog b/contrib/mklog index 1a0e82d1ddd..71fd427ff61 100755 --- a/contrib/mklog +++ b/contrib/mklog @@ -178,8 +178,8 @@ class Hunk: def is_file_diff_start(s): # Don't be fooled by context diff line markers: # *** 385,391 **** - return ((s.startswith('***') and not s.endswith('***')) - or (s.startswith('---') and not s.endswith('---'))) + return ((s.startswith('*** ') and not s.endswith('***')) + or (s.startswith('--- ') and not s.endswith('---'))) def is_ctx_hunk_start(s): return re.match(r'^\*\*\*\*\*\**', s) |