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

Merge pull request #11867 from willthames/dont_smother_exceptions

Browse source 
Allow exceptions to pass through the program
This commit is contained in:
James Cammarata 2015-08-06 07:17:02 -04:00
commit 151010920d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/ansible
View file

@ -36,6 +36,7 @@ import os
import sys import sys
import traceback import traceback
import ansible.constants as C
from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
from ansible.utils.display import Display from ansible.utils.display import Display
@ -103,8 +104,11 @@ if __name__ == '__main__':
except Exception as e: except Exception as e:
have_cli_options = cli is not None and cli.options is not None have_cli_options = cli is not None and cli.options is not None
display.error("Unexpected Exception: %s" % str(e), wrap_text=False) display.error("Unexpected Exception: %s" % str(e), wrap_text=False)
if not have_cli_options or have_cli_options and cli.options.verbosity > 2: if not have_cli_options or have_cli_options and cli.options.verbosity > 2 or C.DEFAULT_DEBUG:
display.display("the full traceback was:\n\n%s" % traceback.format_exc()) display.display("the full traceback was:\n\n%s" % traceback.format_exc())
else: else:
display.display("to see the full traceback, use -vvv") display.display("to see the full traceback, use -vvv")
if C.DEFAULT_DEBUG:
raise
else:
sys.exit(250) sys.exit(250)