removing unwanted variables and using to_native instead of str()

(cherry picked from commit c4b09cbcb4)
pull/21165/head
jerry 8 years ago committed by Brian Coca
parent 4f85e4831d
commit bd19a9e847

@ -2441,11 +2441,11 @@ class AnsibleModule(object):
rc = cmd.returncode rc = cmd.returncode
except (OSError, IOError): except (OSError, IOError):
e = get_exception() e = get_exception()
self.log("%s: Error Executing CMD:%s PERM:%s Exception:%s" % (args[0] , args[1] , str(e))) self.log("Error Executing CMD:%s Exception:%s" % (clean_args, to_native(e)))
self.fail_json(rc=e.errno, msg=to_native(e), cmd=clean_args) self.fail_json(rc=e.errno, msg=to_native(e), cmd=clean_args)
except Exception: except Exception:
e = get_exception() e = get_exception()
self.log("%s: Error Executing CMD:%s PERM:%s Exception:%s" % (args[0] , args[1] , str(traceback.format_exc()))) self.log("Error Executing CMD:%s Exception:%s" % (clean_args,to_native(traceback.format_exc())))
self.fail_json(rc=257, msg=to_native(e), exception=traceback.format_exc(), cmd=clean_args) self.fail_json(rc=257, msg=to_native(e), exception=traceback.format_exc(), cmd=clean_args)
# Restore env settings # Restore env settings

Loading…
Cancel
Save