mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-08-05 05:34:22 -07:00
Minor fix to dependency dupe patch
This commit is contained in:
parent
16258edd7a
commit
7b13b1e03e
1 changed files with 1 additions and 2 deletions
|
@ -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:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue