Commit 0411ea28 by smoothify

Ensure duplicate roles are not loaded in the case of a missing meta/main.yml file.

parent 4eedfa46
...@@ -194,6 +194,8 @@ class Play(object): ...@@ -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')))
......
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