From bd19a9e84744db5006f6e4f5d7f4d97b7b0beb46 Mon Sep 17 00:00:00 2001 From: jerry Date: Mon, 21 Nov 2016 20:28:51 +0000 Subject: [PATCH] removing unwanted variables and using to_native instead of str() (cherry picked from commit c4b09cbcb4df160509f44ffddfedf586391b6878) --- lib/ansible/module_utils/basic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py index efb3867d325..82f5bfb64bb 100644 --- a/lib/ansible/module_utils/basic.py +++ b/lib/ansible/module_utils/basic.py @@ -2441,11 +2441,11 @@ class AnsibleModule(object): rc = cmd.returncode except (OSError, IOError): 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) except 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) # Restore env settings