summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-12-22 09:49:33 -0500
committerNick Mathewson <nickm@torproject.org>2014-12-22 09:49:33 -0500
commit441a481bb8ad3639d400f304cc4771e099830cfc (patch)
treeb51e398ae3c9a50c00fbf21f9a413d4a700e6ad8 /scripts
parent8b532a8c81577701c1af75d4641f7acb1ce5fc91 (diff)
downloadtor-441a481bb8ad3639d400f304cc4771e099830cfc.tar.gz
tor-441a481bb8ad3639d400f304cc4771e099830cfc.zip
Resolve issues in changes files
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/maint/lintChanges.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 43f2f21685..2e57295860 100755
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -32,11 +32,14 @@ def lintfile(fname):
if isBug and not re.search(r'(\d+)', contents):
warn("bugfix does not mention a number")
- elif isBug and not re.search(r'Fixes bug (\d+)', contents):
+ elif isBug and not re.search(r'Fixes ([a-z ]*)bug (\d+)', contents):
warn("bugfix does not say 'Fixes bug XXX'")
- if re.search(r'[bB]ug (\d+)', contents) and not re.search(r'Bugfix on ', contents):
- warn("bugfix does not say 'bugfix on X.Y.Z'")
+ 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 ', contents):
+ warn("bugfix incant is not semicoloned")
if __name__=='__main__':