Merge pull request #11576 from srvg/combine_empty_vars_file

Do not combine group_vars with an empty file
pull/11006/head
Brian Coca 9 years ago
commit 5daa540bc0

@ -308,7 +308,8 @@ class VariableManager:
paths = [os.path.join(path, name) for name in names if not name.startswith('.')]
for p in paths:
_found, results = self._load_inventory_file(path=p, loader=loader)
data = self._combine_vars(data, results)
if results is not None:
data = self._combine_vars(data, results)
else:
file_name, ext = os.path.splitext(path)

Loading…
Cancel
Save