summaryrefslogtreecommitdiff
path: root/lib/ansible/executor
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2019-01-08 10:12:49 -0500
committerSandra McCann <samccann@redhat.com>2019-01-08 10:12:49 -0500
commit207848f354efb556fb79664c41d426d7ba3ea4d8 (patch)
treea33f3c7e0a81cf80b81d4de80cb3e32a5ed45929 /lib/ansible/executor
parentc7f3829ad479211c31eda92dad2c77655cda4fba (diff)
downloadansible-207848f354efb556fb79664c41d426d7ba3ea4d8.tar.gz
avoid x2 setting of set_fact when 'cacheable' (#50564)
* avoid x2 setting of set_fact when 'cacheable' fixes #50556 * ammend docs to new behaviour * added period
Diffstat (limited to 'lib/ansible/executor')
-rw-r--r--lib/ansible/executor/task_executor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index c462e70bef..fc5605210c 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -684,7 +684,7 @@ class TaskExecutor:
return failed_when_result
if 'ansible_facts' in result:
- if self._task.action in ('set_fact', 'include_vars'):
+ if self._task.action in ('include_vars', 'set_fact'):
vars_copy.update(result['ansible_facts'])
else:
# TODO: cleaning of facts should eventually become part of taskresults instead of vars