Fix bug with the file-contents-sorter hook when processing file that does not end in a newline

This commit is contained in:
Daniel Gallagher 2017-06-25 14:40:03 -07:00
parent 50871f83cc
commit 7cfec24f77
2 changed files with 13 additions and 10 deletions

View file

@ -18,19 +18,18 @@ FAIL = 1
def sort_file_contents(f):
before = tuple(f)
before = [line.strip(b'\n\r') for line in f if line.strip()]
after = sorted(before)
before_string = b''.join(before)
after_string = b''.join(after)
if before_string == after_string:
if before == after:
return PASS
else:
f.seek(0)
f.write(after_string)
f.truncate()
return FAIL
after_string = b'\n'.join(after) + b'\n'
f.seek(0)
f.write(after_string)
f.truncate()
return FAIL
def main(argv=None):