Commit db963449 by James Cammarata

Re-fixing ability to have empty json files after inventory refactoring

parent 5e0d07c9
......@@ -1281,9 +1281,11 @@ def _load_vars_from_path(path, results, vault_password=None):
# regular file
elif stat.S_ISREG(pathstat.st_mode):
data = parse_yaml_from_file(path, vault_password=vault_password)
if type(data) != dict:
if data and type(data) != dict:
raise errors.AnsibleError(
"%s must be stored as a dictionary/hash" % path)
elif data is None:
data = {}
# combine vars overrides by default but can be configured to do a
# hash merge in settings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment