From 0cd0a7fda373ac80ae61ff5c2cbf189166038de4 Mon Sep 17 00:00:00 2001 From: Michel Blanc Date: Wed, 13 Feb 2013 17:33:43 +0100 Subject: [PATCH] Fixes jina typos Moved *jina* to *jinja2* --- examples/ansible.cfg | 4 ++-- lib/ansible/constants.py | 2 +- lib/ansible/utils/template.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/ansible.cfg b/examples/ansible.cfg index 6c8713433e1..b1b4e07d0d2 100644 --- a/examples/ansible.cfg +++ b/examples/ansible.cfg @@ -91,10 +91,10 @@ sudo_exe=sudo # if you need to use jinja2 extensions, you can list them here # use a coma to separate extensions, e.g. : -# jinja_extensions=jinja2.ext.do,jinja2.ext.i18n +# jinja2_extensions=jinja2.ext.do,jinja2.ext.i18n # no extensions are loaded by default -#jinja_extensions= +#jinja2_extensions= # if set, always use this private key file for authentication, same as if passing # --private-key to ansible or ansible-playbook diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py index 0bc79db70c4..bf1df51a87e 100644 --- a/lib/ansible/constants.py +++ b/lib/ansible/constants.py @@ -94,7 +94,7 @@ DEFAULT_KEEP_REMOTE_FILES = get_config(p, DEFAULTS, 'keep_remote_files', 'ANSIBL DEFAULT_SUDO_EXE = get_config(p, DEFAULTS, 'sudo_exe', 'ANSIBLE_SUDO_EXE', 'sudo') DEFAULT_SUDO_FLAGS = get_config(p, DEFAULTS, 'sudo_flags', 'ANSIBLE_SUDO_FLAGS', '-H') DEFAULT_HASH_BEHAVIOUR = get_config(p, DEFAULTS, 'hash_behaviour', 'ANSIBLE_HASH_BEHAVIOUR', 'replace') -DEFAULT_JINA_EXTENSIONS = get_config(p, DEFAULTS, 'jinja_extensions', 'ANSIBLE_JINA_EXTENSIONS', None) +DEFAULT_JINJA2_EXTENSIONS = get_config(p, DEFAULTS, 'jinja2_extensions', 'ANSIBLE_JINJA2_EXTENSIONS', None) DEFAULT_ACTION_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'action_plugins', 'ANSIBLE_ACTION_PLUGINS', '/usr/share/ansible_plugins/action_plugins')) DEFAULT_CALLBACK_PLUGIN_PATH = shell_expand_path(get_config(p, DEFAULTS, 'callback_plugins', 'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins')) diff --git a/lib/ansible/utils/template.py b/lib/ansible/utils/template.py index b6e785e7b6a..b8fbc1e1d67 100644 --- a/lib/ansible/utils/template.py +++ b/lib/ansible/utils/template.py @@ -319,12 +319,12 @@ def template_from_file(basedir, path, vars): to load them with the jinja environment ''' jinja_exts = [] - if C.DEFAULT_JINA_EXTENSIONS: + if C.DEFAULT_JINJA2_EXTENSIONS: ''' Let's make sure the configuration directive doesn't contain spaces and split extensions in an array ''' - jinja_exts = C.DEFAULT_JINA_EXTENSIONS.replace(" ", "").split(',') + jinja_exts = C.DEFAULT_JINJA2_EXTENSIONS.replace(" ", "").split(',') environment = jinja2.Environment(loader=loader, trim_blocks=True, extensions=jinja_exts) for filter_plugin in utils.plugins.filter_loader.all():