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

Revert "Allow exceptions to pass through the program"

Browse source 
breaks handling constants.py errors gracefully

This reverts commit 59f96d713e.
This commit is contained in:
Brian Coca 2015-08-06 10:02:40 -04:00
parent d1a6cfe6f0
commit a5e6845c8b
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/ansible
View file

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