summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-02-13 01:02:47 -0500
committerJames Cammarata <jimi@sngx.net>2016-03-24 21:00:25 -0400
commitb7ccc8cfa1e25685bfacf3920fbd6771f10b32d3 (patch)
treea54879a88c8f162570dd1f87d11c3f49b45477e2
parente17ba96589c6f1d72102518dd8d14320b6016d15 (diff)
downloadansible-b7ccc8cfa1e25685bfacf3920fbd6771f10b32d3.tar.gz
Fix bugs related to task_includes and dep chain inheritance
* Fix the way task_include fields were created and copied * Have blocks get_dep_chain() look at task_include's blocks for proper dep chain inheritance * Fix the way task_include fields are copied to prevent a recursive degradation Fixes #14460
-rw-r--r--lib/ansible/playbook/block.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ansible/playbook/block.py b/lib/ansible/playbook/block.py
index d5cd703050..1c9569de8d 100644
--- a/lib/ansible/playbook/block.py
+++ b/lib/ansible/playbook/block.py
@@ -153,6 +153,8 @@ class Block(Base, Become, Conditional, Taggable):
if self._dep_chain is None:
if self._parent_block:
return self._parent_block.get_dep_chain()
+ elif self._task_include:
+ return self._task_include._block.get_dep_chain()
else:
return None
else: