ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

call diff callback also when task diff is true (#39366)

Browse source 
fixes #31129
This commit is contained in:
Brian Coca 2018-04-26 12:18:17 -04:00 committed by Sam Doran
parent 3ce81bdd8d
commit d76298b5d3
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/plugins/strategy/__init__.py
View file

@ -439,12 +439,6 @@ class StrategyBase:
task_result._host = original_host task_result._host = original_host
task_result._task = original_task task_result._task = original_task
# get the correct loop var for use later
if original_task.loop_control:
loop_var = original_task.loop_control.loop_var
else:
loop_var = 'item'
# send callbacks for 'non final' results # send callbacks for 'non final' results
if '_ansible_retry' in task_result._result: if '_ansible_retry' in task_result._result:
self._tqm.send_callback('v2_runner_retry', task_result) self._tqm.send_callback('v2_runner_retry', task_result)
@ -456,7 +450,7 @@ class StrategyBase:
self._tqm.send_callback('v2_runner_item_on_skipped', task_result) self._tqm.send_callback('v2_runner_item_on_skipped', task_result)
else: else:
if 'diff' in task_result._result: if 'diff' in task_result._result:
if self._diff: if self._diff or getattr(original_task, 'diff', False):
self._tqm.send_callback('v2_on_file_diff', task_result) self._tqm.send_callback('v2_on_file_diff', task_result)
self._tqm.send_callback('v2_runner_item_on_ok', task_result) self._tqm.send_callback('v2_runner_item_on_ok', task_result)
continue continue
@ -630,7 +624,7 @@ class StrategyBase:
self._tqm._stats.set_custom_stats(k, data[k], myhost) self._tqm._stats.set_custom_stats(k, data[k], myhost)
if 'diff' in task_result._result: if 'diff' in task_result._result:
if self._diff: if self._diff or getattr(original_task, 'diff', False):
self._tqm.send_callback('v2_on_file_diff', task_result) self._tqm.send_callback('v2_on_file_diff', task_result)
if not isinstance(original_task, TaskInclude): if not isinstance(original_task, TaskInclude):