Skip to content

Commit 041397f

Browse files
committed
---
yaml --- r: 533 b: refs/heads/master c: 828afaa h: refs/heads/master i: 531: 1d790ed v: v3
1 parent 8c7c3e6 commit 041397f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 61156ea714d18c48377ee15f1fa08a44990db2c1
2+
refs/heads/master: 828afaa2fa4cc9e3e53bda0ae3073abfcfa151ca

trunk/src/etc/tidy.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
#!/usr/bin/python
22

3-
import sys, fileinput
3+
import sys, fileinput, subprocess
44

55
err=0
66
cols=78
77

8+
try:
9+
result=subprocess.check_output([ "git", "config", "core.autocrlf" ])
10+
autocrlf=result.strip() == b"true"
11+
except CalledProcessError:
12+
autocrlf=False
13+
814
def report_err(s):
915
global err
1016
print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s))
@@ -14,10 +20,11 @@ def report_err(s):
1420
if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1:
1521
report_err("tab character")
1622

17-
if line.find('\r') != -1:
23+
if not autocrlf and line.find('\r') != -1:
1824
report_err("CR character")
1925

20-
if len(line)-1 > cols:
26+
line_len = len(line)-2 if autocrlf else len(line)-1
27+
if line_len > cols:
2128
report_err("line longer than %d chars" % cols)
2229

2330

0 commit comments

Comments
 (0)