Fix recursive call of _load_inventory_file() in VariableManager

Fixes #16128
pull/16362/head
James Cammarata 9 years ago
parent 0ba9a6a875
commit 9936d7355c

@ -537,7 +537,7 @@ class VariableManager:
# do not parse hidden files or dirs, e.g. .svn/ # do not parse hidden files or dirs, e.g. .svn/
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) results = self._load_inventory_file(path=p, loader=loader)
if results is not None: if results is not None:
data = combine_vars(data, results) data = combine_vars(data, results)

Loading…
Cancel
Save