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

Fix errors in lookup plugins.

Browse source 
Lookup plugins 'sequence' and 'template' now import 'ansible.utils'
appropriately in order to use the 'listify_lookup_plugin_terms'
function.

Also, 'dnstxt' and 'env' now check to see if 'terms' is a string;
without this calls like '{{ lookup('env', 'HOME') }}' fail.
This commit is contained in:
C. Morgan Hamill 2013-04-17 11:06:15 -04:00
parent cce2cad8dc
commit 663d37b537
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/lookup_plugins/dnstxt.py
View file

@ -44,8 +44,8 @@ class LookupModule(object):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject) terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
if isinstance(basestring, terms):
terms = [ terms ]
ret = [] ret = []
for term in terms: for term in terms:

3
lib/ansible/runner/lookup_plugins/env.py
View file

@ -27,6 +27,9 @@ class LookupModule(object):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject) terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
if isinstance(basestring, terms):
terms = [ terms ]
ret = [] ret = []
for term in terms: for term in terms:
var = term.split()[0] var = term.split()[0]

2
lib/ansible/runner/lookup_plugins/fileglob.py
View file

@ -26,7 +26,7 @@ class LookupModule(object):
def run(self, terms, inject=None, **kwargs): def run(self, terms, inject=None, **kwargs):
utils.listify_lookup_plugin_terms(terms, self.basedir, inject) terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
ret = [] ret = []

4
lib/ansible/runner/lookup_plugins/sequence.py
View file

@ -16,7 +16,7 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.utils import parse_kv import ansible.utils as utils
from re import compile as re_compile, IGNORECASE from re import compile as re_compile, IGNORECASE
# shortcut format # shortcut format
@ -181,7 +181,7 @@ class LookupModule(object):
try: try:
if not self.parse_simple_args(term): if not self.parse_simple_args(term):
self.parse_kv_args(parse_kv(term)) self.parse_kv_args(utils.parse_kv(term))
except Exception: except Exception:
raise AnsibleError( raise AnsibleError(
"unknown error parsing with_sequence arguments: %r" "unknown error parsing with_sequence arguments: %r"

1
lib/ansible/runner/lookup_plugins/template.py
View file

@ -16,6 +16,7 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
from ansible.utils import template from ansible.utils import template
import ansible.utils as utils
class LookupModule(object): class LookupModule(object):