diff options
| author | Andrew Taumoefolau <zenbot@gmail.com> | 2016-05-04 15:14:28 +1000 |
|---|---|---|
| committer | nitzmahone <mdavis@ansible.com> | 2016-05-05 15:30:50 -0700 |
| commit | da1e62a6d96423f829b2d5d46c8f94cb3b7d8fe1 (patch) | |
| tree | f4f08b44ddb40762642da2e244936f728d6b4bfa | |
| parent | 198f57b61e5cbb76ac2105998af362d557d287a6 (diff) | |
| download | ansible-da1e62a6d96423f829b2d5d46c8f94cb3b7d8fe1.tar.gz | |
Don't assume a task with non-dict loop results has been skipped.
This changeset addresses the issue reported here:
ansible/ansible-modules-core#1765
The yum module (at least) includes its task results as strings, rather than
dicts, and the code this changeset replaces assumed that in that instance the
task was skipped. The updated behaviour assumes that the task has been
skipped only if:
* results exist, and
* all results are dicts that include a truthy skipped value
| -rw-r--r-- | lib/ansible/executor/task_result.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/ansible/executor/task_result.py b/lib/ansible/executor/task_result.py index da9ab2a11a..db73f1ccb9 100644 --- a/lib/ansible/executor/task_result.py +++ b/lib/ansible/executor/task_result.py @@ -41,11 +41,8 @@ class TaskResult: def is_skipped(self): if 'results' in self._result and self._task.loop: - flag = True - for res in self._result.get('results', []): - if isinstance(res, dict): - flag &= res.get('skipped', False) - return flag + results = self._result['results'] + return results and all(isinstance(res, dict) and res.get('skipped', False) for res in results) else: return self._result.get('skipped', False) |