Skip to content

Commit

Permalink
ansible_freeipa_module: Fix errors in batch mode
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
t-woerner committed Jun 21, 2024
1 parent a1230ca commit 2fb9d24
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions plugins/module_utils/ansible_freeipa_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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[:]
Expand Down

0 comments on commit 2fb9d24

Please sign in to comment.