win_updates: backport 2.5 handle failure on module load (#38498)

* win_updates: handle if module failed to run (#38363)

(cherry picked from commit ccc56e138a)

* Added changelog fragment
This commit is contained in:
Jordan Borean
2018-04-10 06:39:09 +10:00
committed by GitHub
parent 38a13f41cd
commit 9bb2a36289
2 changed files with 11 additions and 0 deletions

View File

@ -0,0 +1,3 @@
bugfixes:
- win_updates - handle if the module fails to load and return the error message
https://github.com/ansible/ansible/pull/38363

View File

@ -186,6 +186,12 @@ class ActionModule(ActionBase):
new_module_args.pop('reboot_timeout', None)
result = self._run_win_updates(new_module_args, task_vars)
# if the module failed to run at all then changed won't be populated
# so we just return the result as is
# https://github.com/ansible/ansible/issues/38232
if result['failed']:
return result
changed = result['changed']
updates = result.get('updates', dict())
filtered_updates = result.get('filtered_updates', dict())
@ -235,6 +241,8 @@ class ActionModule(ActionBase):
result.pop('msg', None)
# rerun the win_updates module after the reboot is complete
result = self._run_win_updates(new_module_args, task_vars)
if result['failed']:
return result
result_updates = result.get('updates', dict())
result_filtered_updates = result.get('filtered_updates', dict())