From 614893f36def2c36a2f60a6d8f213c55d2ada3a4 Mon Sep 17 00:00:00 2001 From: Morgan Courbet Date: Tue, 4 Jul 2017 21:16:27 +0200 Subject: [PATCH] Fix _process_fix_auto to return the right value --- pre_commit_hooks/mixed_line_ending.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pre_commit_hooks/mixed_line_ending.py b/pre_commit_hooks/mixed_line_ending.py index b2419e7..c890976 100644 --- a/pre_commit_hooks/mixed_line_ending.py +++ b/pre_commit_hooks/mixed_line_ending.py @@ -77,7 +77,6 @@ def mixed_line_ending(argv=None): return _process_no_fix(filenames) elif fix_option == MixedLineEndingOption.AUTO: return _process_fix_auto(filenames) - # when a line ending character is forced with --fix option else: line_ending_enum = fix_option.line_ending_enum @@ -188,6 +187,8 @@ def _process_no_fix(filenames): def _process_fix_auto(filenames): + converted_found = False + for filename in filenames: detect_result = _detect_line_ending(filename) @@ -198,21 +199,26 @@ def _process_fix_auto(filenames): le_enum = detect_result.line_ending_enum logging.info('The file %s has mixed line ending with a ' - 'majority of "%s". Converting to "%s"', filename, - le_enum.str_print, le_enum.str_print) + 'majority of "%s". Converting...', filename, + le_enum.str_print) _convert_line_ending(filename, le_enum.string) + converted_found = True + + logging.info('The file %s has been converted to "%s" line ' + 'ending.', filename, le_enum.str_print) - return 1 elif detect_result == MixedLineDetection.NOT_MIXED: logging.info('The file %s has no mixed line ending', filename) - return 0 + converted_found |= False elif detect_result == MixedLineDetection.UNKNOWN: logging.info('Could not define most frequent line ending in ' 'file %s. File skiped.', filename) - return 0 + converted_found |= False + + return 1 if converted_found else 0 def _convert_line_ending(filename, line_ending):