internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel-duplicates' of https://github.com/smoothify/ansible into smoothify-devel-duplicates

Browse Source
This commit is contained in:
James Cammarata
2013-09-04 08:54:56 -05:00
parent 82ed1b8d97 0411ea2867
commit 2c6baf6845
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/playbook/play.py
View File

@@ -194,6 +194,8 @@ class Play(object):
continue continue
else: else:
self.included_roles.append(dep) self.included_roles.append(dep)
else:
continue
dep_vars = utils.combine_vars(passed_vars, dep_vars) dep_vars = utils.combine_vars(passed_vars, dep_vars)
dep_vars = utils.combine_vars(role_vars, dep_vars) dep_vars = utils.combine_vars(role_vars, dep_vars)
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'vars'))) vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'vars')))