ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Small tweak, don't merge conditionals, just evaluate each in turn.

Browse source
This commit is contained in:
Michael DeHaan 2013-06-19 21:17:39 -04:00
parent 58f5bfb4c1
commit d2721526de
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/playbook/task.py
View file

@ -230,5 +230,6 @@ class Task(object):
self.only_if = utils.compile_when_to_only_if(self.when) self.only_if = utils.compile_when_to_only_if(self.when)
if additional_conditions: if additional_conditions:
self.only_if = '(' + self.only_if + ') and (' + ' ) and ('.join(additional_conditions) + ')' self.only_if = [ self.only_if ]
self.only_if.extend(additional_conditions)

7
lib/ansible/runner/__init__.py
View file

@ -504,9 +504,12 @@ class Runner(object):
else: else:
handler = utils.plugins.action_loader.get('async', self) handler = utils.plugins.action_loader.get('async', self)
conditional = template.template(self.basedir, self.conditional, inject, expand_lists=False) if type(self.conditional) != list:
self.conditional = [ self.conditional ]
if not utils.check_conditional(conditional): for cond in self.conditional:
cond = template.template(self.basedir, cond, inject, expand_lists=False)
if not utils.check_conditional(cond):
result = utils.jsonify(dict(changed=False, skipped=True)) result = utils.jsonify(dict(changed=False, skipped=True))
self.callbacks.on_skipped(host, inject.get('item',None)) self.callbacks.on_skipped(host, inject.get('item',None))
return ReturnData(host=host, result=result) return ReturnData(host=host, result=result)