[tor-commits] [tor/master] lintchanges: Allow 'fixes bugs a, b, and c'

[nickm at torproject.org]

commit f46cdb3ff85be4c4241928bfd3f558eb878cff28
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 5 14:41:39 2017 -0500

    lintchanges: Allow 'fixes bugs a, b, and c'
---
 scripts/maint/lintChanges.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index c2dda6dc8..d5b8fcae5 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):