mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
7c8374e0f8
The earlier code did call terms.strip(), but ignored the return value instead of passing that in to templar.template(). Clearly an oversight.
42 lines
1.6 KiB
Python
42 lines
1.6 KiB
Python
# (c) 2014 Michael DeHaan, <michael@ansible.com>
|
|
#
|
|
# This file is part of Ansible
|
|
#
|
|
# Ansible is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Ansible is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# Make coding more python3-ish
|
|
from __future__ import (absolute_import, division, print_function)
|
|
__metaclass__ = type
|
|
|
|
from collections import Iterable
|
|
|
|
from ansible.compat.six import string_types
|
|
|
|
from ansible.template import Templar
|
|
from ansible.template.safe_eval import safe_eval
|
|
|
|
__all__ = ['listify_lookup_plugin_terms']
|
|
|
|
def listify_lookup_plugin_terms(terms, templar, loader, fail_on_undefined=False, convert_bare=True):
|
|
|
|
if isinstance(terms, string_types):
|
|
# TODO: warn/deprecation on bare vars in with_ so we can eventually remove fail on undefined override
|
|
terms = templar.template(terms.strip(), convert_bare=convert_bare, fail_on_undefined=fail_on_undefined)
|
|
else:
|
|
terms = templar.template(terms, fail_on_undefined=fail_on_undefined)
|
|
|
|
if isinstance(terms, string_types) or not isinstance(terms, Iterable):
|
|
terms = [ terms ]
|
|
|
|
return terms
|