summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-07-23 14:14:41 -0400
committerJames Cammarata <jimi@sngx.net>2015-07-23 15:26:30 -0400
commit469aa0c26a91e8928d58448bd51d913c74734986 (patch)
treebcb717757bd3304c35d81e8b584bbf45663c9261 /bin
parentf8e4aff4c19650176201ddba61274e830115a0db (diff)
downloadansible-469aa0c26a91e8928d58448bd51d913c74734986.tar.gz
Don't wrap text on most errors
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ansible6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ansible b/bin/ansible
index 3a17861ceb..445e722f57 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -80,7 +80,7 @@ if __name__ == '__main__':
except AnsibleOptionsError as e:
cli.parser.print_help()
- display.error(str(e))
+ display.error(str(e), wrap_text=False)
sys.exit(5)
except AnsibleParserError as e:
display.error(str(e), wrap_text=False)
@@ -93,14 +93,14 @@ if __name__ == '__main__':
# display.error(str(e))
# sys.exit(2)
except AnsibleError as e:
- display.error(str(e))
+ display.error(str(e), wrap_text=False)
sys.exit(1)
except KeyboardInterrupt:
display.error("User interrupted execution")
sys.exit(99)
except Exception as e:
have_cli_options = cli is not None and cli.options is not None
- display.error("Unexpected Exception: %s" % str(e))
+ display.error("Unexpected Exception: %s" % str(e), wrap_text=False)
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: