normal action plugin: remove superfluous code (#79690)

* Remove obsolete 'if'

The result dict returned by super.run() will never have a 'skipped' entry.
Without the if, it is more clear that wrap_async is actually defined at the end of the function.

* Remove more dead code.

The result dict will also not contain invocation.

* Remove notes.
pull/79719/head
Felix Fontein 2 years ago committed by GitHub
parent ee33be9484
commit 50a673f9e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- "normal action plugin - remove obsolete ``if`` (https://github.com/ansible/ansible/pull/79690)."

@ -33,24 +33,15 @@ class ActionModule(ActionBase):
result = super(ActionModule, self).run(tmp, task_vars) result = super(ActionModule, self).run(tmp, task_vars)
del tmp # tmp no longer has any effect del tmp # tmp no longer has any effect
if not result.get('skipped'): wrap_async = self._task.async_val and not self._connection.has_native_async
if result.get('invocation', {}).get('module_args'): # do work!
# avoid passing to modules in case of no_log result = merge_hash(result, self._execute_module(task_vars=task_vars, wrap_async=wrap_async))
# should not be set anymore but here for backwards compatibility
del result['invocation']['module_args']
# FUTURE: better to let _execute_module calculate this internally? # hack to keep --verbose from showing all the setup module result
wrap_async = self._task.async_val and not self._connection.has_native_async # moved from setup module as now we filter out all _ansible_ from result
if self._task.action in C._ACTION_SETUP:
# do work! result['_ansible_verbose_override'] = True
result = merge_hash(result, self._execute_module(task_vars=task_vars, wrap_async=wrap_async))
# hack to keep --verbose from showing all the setup module result
# moved from setup module as now we filter out all _ansible_ from result
# FIXME: is this still accurate with gather_facts etc, or does it need support for FQ and other names?
if self._task.action in C._ACTION_SETUP:
result['_ansible_verbose_override'] = True
if not wrap_async: if not wrap_async:
# remove a temporary path we created # remove a temporary path we created

Loading…
Cancel
Save