internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

made returns from next task consistent to avoid typeerrors, also linear now checks for none

Browse Source 
fixes #11965
This commit is contained in:
Brian Coca
2015-08-14 18:07:14 -04:00
parent 9f5e4c0ef6
commit 245e0dd4b7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/executor/play_iterator.py
View File

@@ -130,7 +130,7 @@ class PlayIterator:
task = None task = None
if s.run_state == self.ITERATING_COMPLETE: if s.run_state == self.ITERATING_COMPLETE:
return None return (None, None)
elif s.run_state == self.ITERATING_SETUP: elif s.run_state == self.ITERATING_SETUP:
s.run_state = self.ITERATING_TASKS s.run_state = self.ITERATING_TASKS
s.pending_setup = True s.pending_setup = True

3
lib/ansible/plugins/strategies/linear.py
View File

@@ -58,6 +58,9 @@ class StrategyModule(StrategyBase):
continue continue
(s, t) = v (s, t) = v
if t is None:
continue
if s.cur_block < lowest_cur_block and s.run_state != PlayIterator.ITERATING_COMPLETE: if s.cur_block < lowest_cur_block and s.run_state != PlayIterator.ITERATING_COMPLETE:
lowest_cur_block = s.cur_block lowest_cur_block = s.cur_block