From db963449666041414813dfd4486dec9a64ab18de Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Fri, 11 Jul 2014 13:19:36 -0500 Subject: [PATCH] Re-fixing ability to have empty json files after inventory refactoring --- lib/ansible/utils/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py index fb391f9efd0..f04b4df5c21 100644 --- a/lib/ansible/utils/__init__.py +++ b/lib/ansible/utils/__init__.py @@ -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