ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-23 05:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix multiple var files combining (followup to #36357)

Browse source
This commit is contained in:
Andrey Laguta 2018-06-20 23:49:34 +03:00 • committed by Brian Coca
commit 2e62e36590
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/role/__init__.py
View file

@ -262,7 +262,7 @@ class Role(Base, Become, Conditional, Taggable):
data = combine_vars(data, new_data)
else:
data = new_data
return data
return data
elif main is not None:
raise AnsibleParserError("Could not find specified file in role: %s/%s" % (subdir, main))
return None