Skip to content

A
ansible
Commit 6cf99cf6 by James Cammarata
Options

Merge pull request #12328 from amenonsen/noneguard 

Test state.tasks_child_state before dereferencing
parents df89f036 049a48f3
Showing with 3 additions and 3 deletions
lib/ansible/executor/play_iterator.py
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment