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

check type to avoid typeerror tb

Browse source 
fixes #31290 by giving more meaningful message
This commit is contained in:
Brian Coca 2017-10-04 09:26:45 -04:00 committed by Brian Coca
parent 115b4fdc9b
commit 8aa33419c9
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/plugins/inventory/yaml.py
View file

@ -49,7 +49,6 @@ all: # keys must be unique, i.e. only one 'hosts' per group
last_var: MYVALUE last_var: MYVALUE
''' '''
import re
import os import os
from collections import MutableMapping from collections import MutableMapping
@ -106,8 +105,14 @@ class InventoryModule(BaseFileInventoryPlugin):
if isinstance(group_data, MutableMapping): if isinstance(group_data, MutableMapping):
# make sure they are dicts # make sure they are dicts
for section in ['vars', 'children', 'hosts']: for section in ['vars', 'children', 'hosts']:
if section in group_data and isinstance(group_data[section], string_types): if section in group_data:
group_data[section] = {group_data[section]: None} # convert strings to dicts as these are allowed
if isinstance(group_data[section], string_types):
group_data[section] = {group_data[section]: None}
if not isinstance(group_data[section], MutableMapping):
raise AnsibleParserError('Invalid %s entry for %s group, requires a dictionary, found %s instead.' %
(section, group, type(group_data[section])))
if group_data.get('vars', False): if group_data.get('vars', False):
for var in group_data['vars']: for var in group_data['vars']: