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

12 years ago · 2c6baf6845
parent 82ed1b8d97 0411ea2867
commit 2c6baf6845
1 changed files with 2 additions and 0 deletions
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@ -194,6 +194,8 @@ class Play(object):
                                        continue
                                    else:
                                        self.included_roles.append(dep)
+                        else:
+                            continue
                        dep_vars = utils.combine_vars(passed_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')))