cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor formatting

Browse source
This commit is contained in:
Michael DeHaan 2013-04-10 18:19:31 -04:00
parent d7206d84bb
commit 9ac25bb8f6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/utils/template.py
View file

@ -382,12 +382,14 @@ def template_from_file(basedir, path, vars):
managed_default = C.DEFAULT_MANAGED_STR managed_default = C.DEFAULT_MANAGED_STR
managed_str = managed_default.format( managed_str = managed_default.format(
host = vars['template_host'], host = vars['template_host'],
uid = vars['template_uid'], uid = vars['template_uid'],
file = vars['template_path'] file = vars['template_path']
) )
vars['ansible_managed'] = time.strftime(managed_str, vars['ansible_managed'] = time.strftime(
time.localtime(os.path.getmtime(realpath))) managed_str,
time.localtime(os.path.getmtime(realpath))
)
# This line performs deep Jinja2 magic that uses the _jinja2_vars object for vars # This line performs deep Jinja2 magic that uses the _jinja2_vars object for vars
# Ideally, this could use some API where setting shared=True and the object won't get # Ideally, this could use some API where setting shared=True and the object won't get
@ -399,6 +401,7 @@ def template_from_file(basedir, path, vars):
return template(basedir, res, vars) return template(basedir, res, vars)
def _get_filter_plugins(): def _get_filter_plugins():
global FILTER_PLUGINS global FILTER_PLUGINS
if FILTER_PLUGINS is not None: if FILTER_PLUGINS is not None:
return FILTER_PLUGINS return FILTER_PLUGINS