ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixing parent block serialization for blocks

Browse source 
Fixes #12395
This commit is contained in:
James Cammarata 2015-09-16 09:29:16 -04:00
parent 2a50957ad8
commit d91ff0db74
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/playbook/block.py
View file

@ -144,7 +144,7 @@ class Block(Base, Become, Conditional, Taggable):
# use_handlers=self._use_handlers, # use_handlers=self._use_handlers,
# ) # )
def copy(self, exclude_parent=False): def copy(self, exclude_parent=False, exclude_tasks=False):
def _dupe_task_list(task_list, new_block): def _dupe_task_list(task_list, new_block):
new_task_list = [] new_task_list = []
for task in task_list: for task in task_list:
@ -162,13 +162,14 @@ class Block(Base, Become, Conditional, Taggable):
new_me._use_handlers = self._use_handlers new_me._use_handlers = self._use_handlers
new_me._dep_chain = self._dep_chain[:] new_me._dep_chain = self._dep_chain[:]
new_me.block = _dupe_task_list(self.block or [], new_me) if not exclude_tasks:
new_me.rescue = _dupe_task_list(self.rescue or [], new_me) new_me.block = _dupe_task_list(self.block or [], new_me)
new_me.always = _dupe_task_list(self.always or [], new_me) new_me.rescue = _dupe_task_list(self.rescue or [], new_me)
new_me.always = _dupe_task_list(self.always or [], new_me)
new_me._parent_block = None new_me._parent_block = None
if self._parent_block and not exclude_parent: if self._parent_block and not exclude_parent:
new_me._parent_block = self._parent_block.copy() new_me._parent_block = self._parent_block.copy(exclude_tasks=exclude_tasks)
new_me._role = None new_me._role = None
if self._role: if self._role:
@ -197,6 +198,8 @@ class Block(Base, Become, Conditional, Taggable):
data['role'] = self._role.serialize() data['role'] = self._role.serialize()
if self._task_include is not None: if self._task_include is not None:
data['task_include'] = self._task_include.serialize() data['task_include'] = self._task_include.serialize()
if self._parent_block is not None:
data['parent_block'] = self._parent_block.copy(exclude_tasks=True).serialize()
return data return data
@ -230,6 +233,12 @@ class Block(Base, Become, Conditional, Taggable):
ti.deserialize(ti_data) ti.deserialize(ti_data)
self._task_include = ti self._task_include = ti
pb_data = data.get('parent_block')
if pb_data:
pb = Block()
pb.deserialize(pb_data)
self._parent_block = pb
def evaluate_conditional(self, templar, all_vars): def evaluate_conditional(self, templar, all_vars):
if len(self._dep_chain): if len(self._dep_chain):
for dep in self._dep_chain: for dep in self._dep_chain:

1
samples/test_blocks_of_blocks.yml
View file

@ -11,3 +11,4 @@
- fail: - fail:
rescue: rescue:
- debug: msg="rescuing from the fail" - debug: msg="rescuing from the fail"
when: not skip_me|default(False)