Skip to content

A
ansible
Commit c15a6cc6 by Toshio Kuratomi
Options

Convert whole string to unicode to fix UnicodeError 

Fixes #11472
parent 62a1efa0
Showing with 2 additions and 2 deletions
bin/ansible-playbook
...@@ -310,7 +310,7 @@ def main(args): ...@@ -310,7 +310,7 @@ def main(args):
return 3 return 3
except errors.AnsibleError, e: except errors.AnsibleError, e:
display("ERROR: %s" % e, color='red') display(u"ERROR: %s" % utils.unicode.to_unicode(e, nonstring='simplerepr'), color='red')
return 1 return 1
return 0 return 0
...@@ -323,7 +323,7 @@ if __name__ == "__main__": ...@@ -323,7 +323,7 @@ if __name__ == "__main__":
try: try:
sys.exit(main(sys.argv[1:])) sys.exit(main(sys.argv[1:]))
except errors.AnsibleError, e: except errors.AnsibleError, e:
display("ERROR: %s" % e, color='red', stderr=True) display(u"ERROR: %s" % utils.unicode.to_unicode(e, nonstring='simplerepr'), color='red', stderr=True)
sys.exit(1) sys.exit(1)
except KeyboardInterrupt, ke: except KeyboardInterrupt, ke:
display("ERROR: interrupted", color='red', stderr=True) display("ERROR: interrupted", color='red', stderr=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment