cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11576 from srvg/combine_empty_vars_file

Browse source 
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
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/vars/__init__.py
View file

@ -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)