cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't double (or triple) up common error messages

Browse source 
process_common_errors() was called thrice, each time appending to the
existing error message, and leading to confusing repetition in the
message that was finally displayed.

Fixes #7498
This commit is contained in:
Abhijit Menon-Sen 2014-05-23 21:03:50 +05:30
parent 871f0378c8
commit f6792b724a
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils/__init__.py
View file

@ -501,7 +501,6 @@ Note: The error may actually appear before this position: line %s, column %s
if '"{{' not in probline or "'{{" not in probline: if '"{{' not in probline or "'{{" not in probline:
unquoted_var = True unquoted_var = True
msg = process_common_errors(msg, probline, mark.column)
if not unquoted_var: if not unquoted_var:
msg = process_common_errors(msg, probline, mark.column) msg = process_common_errors(msg, probline, mark.column)
else: else:
@ -519,7 +518,6 @@ Should be written as:
- "{{ foo }}" - "{{ foo }}"
""" """
msg = process_common_errors(msg, probline, mark.column)
else: else:
# most likely displaying a file with sensitive content, # most likely displaying a file with sensitive content,
# so don't show any of the actual lines of yaml just the # so don't show any of the actual lines of yaml just the