corrected changed_when handling

9 years ago · 928a0863c2
parent f7dc7e3aab
commit 928a0863c2
1 changed files with 1 additions and 3 deletions
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@ -447,12 +447,10 @@ class TaskExecutor:

            # helper methods for use below in evaluating changed/failed_when
            def _evaluate_changed_when_result(result):
-                if self._task.changed_when:
+                if self._task.changed_when is not None and self._task.changed_when:
                    cond = Conditional(loader=self._loader)
                    cond.when = self._task.changed_when
                    result['changed'] = cond.evaluate_conditional(templar, vars_copy)
-                else:
-                    result['changed'] = False

            def _evaluate_failed_when_result(result):
                if self._task.failed_when: