wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Target unnecessary templating warning at lines consisting of a single variable

Browse source 
Fixes #6407
This commit is contained in:
Toshio Kuratomi 2014-09-29 17:54:15 -04:00
parent 5e0121e11b
commit a1809a371a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,8 +84,11 @@ class Task(object):
# code to allow "with_glob" and to reference a lookup plugin named glob
elif x.startswith("with_"):
if isinstance(ds[x], basestring) and ds[x].lstrip().startswith("{{"):
# Only a variable, no logic
if (isinstance(ds[x], basestring) and
ds[x].startswith('{{') and
ds[x].find('}}') == len(ds[x]) - 2 and
find ('|') == -1):
utils.warning("It is unnecessary to use '{{' in loops, leave variables in loop expressions bare.")
plugin_name = x.replace("with_","")
@ -97,7 +100,11 @@ class Task(object):
raise errors.AnsibleError("cannot find lookup plugin named %s for usage in with_%s" % (plugin_name, plugin_name))
elif x in [ 'changed_when', 'failed_when', 'when']:
if isinstance(ds[x], basestring) and ds[x].lstrip().startswith("{{"):
# Only a variable, no logic
if (isinstance(ds[x], basestring) and
ds[x].startswith('{{') and
ds[x].find('}}') == len(ds[x]) - 2 and
find ('|') == -1):
utils.warning("It is unnecessary to use '{{' in conditionals, leave variables in loop expressions bare.")
elif x.startswith("when_"):
utils.deprecated("The 'when_' conditional has been removed. Switch to using the regular unified 'when' statements as described on docs.ansible.com.","1.5", removed=True)