From 2fb9d246d927b801f7bb40efc01dd575d83949e3 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Fri, 21 Jun 2024 17:11:13 +0200 Subject: [PATCH] ansible_freeipa_module: Fix errors in batch mode The error string returned by execute_ipa_commands in batch mode additionally contains the whole parameter list for the command. This is different to non batch mode execution and breaks tests that are checking the returned error message. A left over debug message also have been removed from the error processing. --- plugins/module_utils/ansible_freeipa_module.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py index 2f0ebff6e..30ee72cd6 100644 --- a/plugins/module_utils/ansible_freeipa_module.py +++ b/plugins/module_utils/ansible_freeipa_module.py @@ -1485,7 +1485,6 @@ def exception_handler(module, ex, exit_args, one_name): filter(lambda x: x[0] in keeponly, _res.items()) ) - self.tm_warn("res: %s" % repr(res)) if "error" not in res or res["error"] is None: if result_handler is not None: @@ -1498,10 +1497,9 @@ def exception_handler(module, ex, exit_args, one_name): changed = True else: _errors.append( - "%s %s %s: %s" % + "%s %s: %s" % (batch_args[ri]["method"], repr(batch_args[ri]["params"][0][0]), - repr(batch_args[ri]["params"][1]), res["error"])) # clear batch command list (python2 compatible) del batch_args[:]