From: cypherpunks <cypherpunks@torproject.org>
Date: Fri, 6 Mar 2015 14:08:45 +0000 (+0100)
Subject: Be exact about the number of spaces in the header.
X-Git-Tag: tor-0.2.7.1-alpha~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=034f51dd0223b4d2969a3ecc2f0dc661b07bc6f1;p=thirdparty%2Ftor.git

Be exact about the number of spaces in the header.

Also fixes changes files that warn on this.
---

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())