From 157e05d5a91d5a27bc42b70fcc96f9986dbe39be Mon Sep 17 00:00:00 2001 From: "Kenneth M. Elf Sternberg" Date: Mon, 26 Sep 2016 16:09:05 -0700 Subject: [PATCH] Back to really/long/file/paths, but the trimmer was in the wrong spot. Must think more on this. --- git_lint/git_lint.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git_lint/git_lint.py b/git_lint/git_lint.py index af23974..3a609aa 100644 --- a/git_lint/git_lint.py +++ b/git_lint/git_lint.py @@ -508,8 +508,10 @@ def run_external_linter(filename, linter, linter_name): if not failed: return (trimmed_filename, linter_name, 0, []) - prefix = ((linter.get('print', 'false').strip().lower() != 'true') and ' ') or ' {}: '.format(trimmed_filename) - output = base_file_cleaner(encode_shell_messages(prefix, out) + ((err and encode_shell_messages(prefix, err)) or [])) + prefix = (((linter.get('print', 'false').strip().lower() != 'true') and ' ') + 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)