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

Merge pull request #11515 from msabramo/nicer_output_for_parser_errors

Browse source 
Don't wrap text for AnsibleParserError
This commit is contained in:
Brian Coca 2015-07-07 13:00:41 -04:00
commit 898c7cc09f
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible
View file

@ -80,7 +80,7 @@ if __name__ == '__main__':
display.error(str(e)) display.error(str(e))
sys.exit(5) sys.exit(5)
except AnsibleParserError as e: except AnsibleParserError as e:
display.error(str(e)) display.error(str(e), wrap_text=False)
sys.exit(4) sys.exit(4)
# TQM takes care of these, but leaving comment to reserve the exit codes # TQM takes care of these, but leaving comment to reserve the exit codes
# except AnsibleHostUnreachable as e: # except AnsibleHostUnreachable as e:

5
lib/ansible/utils/display.py
View file

@ -182,10 +182,13 @@ class Display:
(out, err) = cmd.communicate() (out, err) = cmd.communicate()
self.display("%s\n" % out, color=color) self.display("%s\n" % out, color=color)
def error(self, msg): def error(self, msg, wrap_text=True):
if wrap_text:
new_msg = "\n[ERROR]: %s" % msg new_msg = "\n[ERROR]: %s" % msg
wrapped = textwrap.wrap(new_msg, 79) wrapped = textwrap.wrap(new_msg, 79)
new_msg = "\n".join(wrapped) + "\n" new_msg = "\n".join(wrapped) + "\n"
else:
new_msg = msg
if new_msg not in self._errors: if new_msg not in self._errors:
self.display(new_msg, color='red', stderr=True) self.display(new_msg, color='red', stderr=True)
self._errors[new_msg] = 1 self._errors[new_msg] = 1