diff options
| -rw-r--r-- | src/etc/tidy.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/etc/tidy.py b/src/etc/tidy.py index eff967bf6ce..e8f566e11e9 100644 --- a/src/etc/tidy.py +++ b/src/etc/tidy.py @@ -1,10 +1,16 @@ #!/usr/bin/python -import sys, fileinput +import sys, fileinput, subprocess err=0 cols=78 +try: + result=subprocess.check_output([ "git", "config", "core.autocrlf" ]) + autocrlf=result.strip() == b"true" +except CalledProcessError: + autocrlf=False + def report_err(s): global err print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s)) @@ -14,10 +20,11 @@ for line in fileinput.input(openhook=fileinput.hook_encoded("utf-8")): if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1: report_err("tab character") - if line.find('\r') != -1: + if not autocrlf and line.find('\r') != -1: report_err("CR character") - if len(line)-1 > cols: + line_len = len(line)-2 if autocrlf else len(line)-1 + if line_len > cols: report_err("line longer than %d chars" % cols) |