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
20957a1b
Commit
20957a1b
authored
Aug 11, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicate compiling of task when: statements
Fixes #8538
parent
e49c4e29
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
lib/ansible/playbook/play.py
+0
-6
lib/ansible/playbook/task.py
+2
-1
No files found.
lib/ansible/playbook/play.py
View file @
20957a1b
...
...
@@ -563,12 +563,6 @@ class Play(object):
if
'vars'
in
x
:
task_vars
=
utils
.
combine_vars
(
task_vars
,
x
[
'vars'
])
if
'when'
in
x
:
if
isinstance
(
x
[
'when'
],
(
basestring
,
bool
)):
included_additional_conditions
.
append
(
x
[
'when'
])
elif
isinstance
(
x
[
'when'
],
list
):
included_additional_conditions
.
extend
(
x
[
'when'
])
new_role
=
None
if
'role_name'
in
x
:
new_role
=
x
[
'role_name'
]
...
...
lib/ansible/playbook/task.py
View file @
20957a1b
...
...
@@ -300,6 +300,7 @@ class Task(object):
self
.
tags
.
extend
(
import_tags
)
if
additional_conditions
:
new_conditions
=
additional_conditions
new_conditions
=
additional_conditions
[:]
if
self
.
when
:
new_conditions
.
append
(
self
.
when
)
self
.
when
=
new_conditions
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