Skip to content

A
ansible
Commit 7b13b1e0 by James Cammarata
Options

Minor fix to dependency dupe patch

parent 16258edd
Showing with 1 additions and 2 deletions
lib/ansible/playbook/play.py
...@@ -183,14 +183,13 @@ class Play(object): ...@@ -183,14 +183,13 @@ class Play(object):
if data: if data:
dependencies = data.get('dependencies',[]) dependencies = data.get('dependencies',[])
for dep in dependencies: for dep in dependencies:
allow_dupes = False
(dep_path,dep_vars) = self._get_role_path(dep) (dep_path,dep_vars) = self._get_role_path(dep)
meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'meta'))) meta = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'meta')))
if os.path.isfile(meta): if os.path.isfile(meta):
meta_data = utils.parse_yaml_from_file(meta) meta_data = utils.parse_yaml_from_file(meta)
if meta_data: if meta_data:
allow_dupes = utils.boolean(meta_data.get('allow_duplicates','')) allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
else:
allow_dupes = False
if not allow_dupes: if not allow_dupes:
if dep in self.included_roles: if dep in self.included_roles:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment