summaryrefslogtreecommitdiff
path: root/lib/ansible/vars/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/vars/__init__.py')
-rw-r--r--lib/ansible/vars/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/vars/__init__.py b/lib/ansible/vars/__init__.py
index 13c9cc8f08..96313ef4f4 100644
--- a/lib/ansible/vars/__init__.py
+++ b/lib/ansible/vars/__init__.py
@@ -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)