Merge branch 'master' of github.com:elfsternberg/git-lint
* 'master' of github.com:elfsternberg/git-lint: Back to really/long/file/paths, but the trimmer was in the wrong spot. Must think more on this.
This commit is contained in:
commit
fb1bae7790
|
@ -508,8 +508,10 @@ def run_external_linter(filename, linter, linter_name):
|
||||||
if not failed:
|
if not failed:
|
||||||
return (trimmed_filename, linter_name, 0, [])
|
return (trimmed_filename, linter_name, 0, [])
|
||||||
|
|
||||||
prefix = ((linter.get('print', 'false').strip().lower() != 'true') and ' ') or ' {}: '.format(trimmed_filename)
|
prefix = (((linter.get('print', 'false').strip().lower() != 'true') and ' ')
|
||||||
output = base_file_cleaner(encode_shell_messages(prefix, out) + ((err and encode_shell_messages(prefix, err)) or []))
|
or ' {}: '.format(trimmed_filename))
|
||||||
|
output = (encode_shell_messages(prefix, out) +
|
||||||
|
((err and encode_shell_messages(prefix, err)) or []))
|
||||||
return (trimmed_filename, linter_name, (returncode or 1), output)
|
return (trimmed_filename, linter_name, (returncode or 1), output)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue