summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcypherpunks <cypherpunks@torproject.org>2015-03-06 15:08:45 +0100
committerNick Mathewson <nickm@torproject.org>2015-03-09 09:00:40 -0400
commit034f51dd0223b4d2969a3ecc2f0dc661b07bc6f1 (patch)
treef6640eb00f76689cbb69f1ddde09d89f874e40b1
parent9dc90a5b7bf02bc9a034b57bdbc1588745d00447 (diff)
downloadtor-034f51dd0223b4d2969a3ecc2f0dc661b07bc6f1.tar.gz
tor-034f51dd0223b4d2969a3ecc2f0dc661b07bc6f1.zip
Be exact about the number of spaces in the header.
Also fixes changes files that warn on this.
-rw-r--r--changes/bug148064
-rwxr-xr-xscripts/maint/lintChanges.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/changes/bug14806 b/changes/bug14806
index 3a2e355e8b..dd85e785ce 100644
--- a/changes/bug14806
+++ b/changes/bug14806
@@ -1,3 +1,3 @@
- o Minor bugfixes (testing):
- - Commandline argument tests moved to Stem. Fixes bug 14806.
+ o Minor bugfixes (testing):
+ - Commandline argument tests moved to Stem. Fixes bug 14806.
diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 19d03ec8da..c2fc01d2bf 100755
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -31,7 +31,7 @@ def lintfile(fname):
lines = contents.split("\n")
isBug = ("bug" in lines[0] or "fix" in lines[0])
- if not re.match(r'^ +o (.*)', contents):
+ if not re.match(r'^[ ]{2}o (.*)', contents):
warn("header not in format expected")
contents = " ".join(contents.split())