archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12328 from amenonsen/noneguard

Browse Source 
Test state.tasks_child_state before dereferencing
pull/12330/head
James Cammarata 9 years ago
parent df89f03627 049a48f3d3
commit 6cf99cf614
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
lib/ansible/executor/play_iterator.py
Unescape Escape View File

@ -237,7 +237,7 @@ class PlayIterator:
if task is None:
# check to see if the child state was failed, if so we need to
# fail here too so we don't continue iterating tasks
if state.tasks_child_state.fail_state != self.FAILED_NONE:
if state.tasks_child_state and state.tasks_child_state.fail_state != self.FAILED_NONE:
state.fail_state |= self.FAILED_TASKS
state.tasks_child_state = None
state.cur_regular_task += 1
@ -263,7 +263,7 @@ class PlayIterator:
if task is None:
# check to see if the child state was failed, if so we need to
# fail here too so we don't continue iterating rescue
if state.tasks_child_state.fail_state != self.FAILED_NONE:
if state.tasks_child_state and state.tasks_child_state.fail_state != self.FAILED_NONE:
state.fail_state |= self.FAILED_RESCUE
state.rescue_child_state = None
state.cur_rescue_task += 1
@ -293,7 +293,7 @@ class PlayIterator:
if task is None:
# check to see if the child state was failed, if so we need to
# fail here too so we don't continue iterating always
if state.tasks_child_state.fail_state != self.FAILED_NONE:
if state.tasks_child_state and state.tasks_child_state.fail_state != self.FAILED_NONE:
state.fail_state |= self.FAILED_ALWAYS
state.always_child_state = None
state.cur_always_task += 1

Write Preview
Loading…
Cancel
Save