diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-05 14:41:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-05 14:41:53 -0500 |
| commit | f755f9b9e67232d9d39682cbcdf4433ac738e17a (patch) | |
| tree | ee34a98516bc1c9993da132611922e2584ed4868 /scripts | |
| parent | 9f650b24e97c69216b0d85d20b8363ce1a2488de (diff) | |
| parent | f46cdb3ff85be4c4241928bfd3f558eb878cff28 (diff) | |
| download | tor-f755f9b9e67232d9d39682cbcdf4433ac738e17a.tar.gz tor-f755f9b9e67232d9d39682cbcdf4433ac738e17a.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/maint/lintChanges.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py index c2dda6dc81..d5b8fcae5c 100755 --- a/scripts/maint/lintChanges.py +++ b/scripts/maint/lintChanges.py @@ -76,13 +76,13 @@ def lintfile(fname): if isBug and not re.search(r'(\d+)', contents): warn("Ticket marked as bugfix, but does not mention a number.") - elif isBug and not re.search(r'Fixes ([a-z ]*)bug (\d+)', contents): + elif isBug and not re.search(r'Fixes ([a-z ]*)bugs? (\d+)', contents): warn("Ticket marked as bugfix, but does not say 'Fixes bug XXX'") if re.search(r'[bB]ug (\d+)', contents): if not re.search(r'[Bb]ugfix on ', contents): warn("Bugfix does not say 'bugfix on X.Y.Z'") - elif not re.search('[fF]ixes ([a-z ]*)bug (\d+); bugfix on ', + elif not re.search('[fF]ixes ([a-z ]*)bugs? (\d+)((, \d+)* and \d+)?; bugfix on ', contents): warn("Bugfix does not say 'Fixes bug X; bugfix on Y'") elif re.search('tor-([0-9]+)', contents): |