Skip to content

Commit

Permalink
Fix recursive call of _load_inventory_file() in VariableManager
Browse files Browse the repository at this point in the history
  • Loading branch information
jimi-c committed Jun 6, 2016
1 parent 560532d commit add2d19
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/ansible/vars/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def _load_inventory_file(self, path, loader):
# do not parse hidden files or dirs, e.g. .svn/
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)
results = self._load_inventory_file(path=p, loader=loader)
if results is not None:
data = combine_vars(data, results)

Expand Down

0 comments on commit add2d19

Please sign in to comment.