Merge pull request #11576 from srvg/combine_empty_vars_file

Do not combine group_vars with an empty file
This commit is contained in:
Brian Coca 2015-07-13 18:26:02 -04:00
commit 5daa540bc0

View file

@ -308,6 +308,7 @@ 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)
if results is not None:
data = self._combine_vars(data, results)
else: