Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
245e0dd4
Commit
245e0dd4
authored
Aug 14, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
made returns from next task consistent to avoid typeerrors, also linear now checks for none
fixes #11965
parent
9f5e4c0e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
lib/ansible/executor/play_iterator.py
+1
-1
lib/ansible/plugins/strategies/linear.py
+3
-0
No files found.
lib/ansible/executor/play_iterator.py
View file @
245e0dd4
...
@@ -130,7 +130,7 @@ class PlayIterator:
...
@@ -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
...
...
lib/ansible/plugins/strategies/linear.py
View file @
245e0dd4
...
@@ -58,6 +58,9 @@ class StrategyModule(StrategyBase):
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment