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

Convert whole string to unicode to fix UnicodeError

Browse source 
Fixes #11472
This commit is contained in:
Toshio Kuratomi 2015-07-02 10:23:57 -07:00
parent 62a1efa0c6
commit c15a6cc634
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/ansible-playbook
View file

@ -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__":
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)