cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor fix to dependency dupe patch

Browse source
This commit is contained in:
James Cammarata 2013-09-04 11:21:49 -05:00
parent 16258edd7a
commit 7b13b1e03e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/playbook/play.py
View file

@ -183,14 +183,13 @@ class Play(object):
if data:
dependencies = data.get('dependencies',[])
for dep in dependencies:
allow_dupes = False
(dep_path,dep_vars) = self._get_role_path(dep)
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'meta')))
if os.path.isfile(meta):
meta_data = utils.parse_yaml_from_file(meta)
if meta_data:
allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
else:
allow_dupes = False
if not allow_dupes:
if dep in self.included_roles: