Do not combine group_vars with an empty file

This addresses a specific case with multiple vars files
in a group_vars/${groupname}/ directory where one of those files
is empty, which returns None instead of an empty dict.
parent c4b6d912
...@@ -308,7 +308,8 @@ class VariableManager: ...@@ -308,7 +308,8 @@ class VariableManager:
paths = [os.path.join(path, name) for name in names if not name.startswith('.')] paths = [os.path.join(path, name) for name in names if not name.startswith('.')]
for p in paths: for p in paths:
_found, results = self._load_inventory_file(path=p, loader=loader) _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: else:
file_name, ext = os.path.splitext(path) file_name, ext = os.path.splitext(path)
......
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