summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2013-09-04 11:21:49 -0500
committerJames Cammarata <jimi@sngx.net>2013-09-04 11:26:49 -0500
commit7b13b1e03e4f312d0fb3c77a18ea761749428b9e (patch)
treeabcfcb1b8da267fe3c1258f34830de566ea19283
parent16258edd7a535bdd5e6e33febf741b62c0a98559 (diff)
downloadansible-7b13b1e03e4f312d0fb3c77a18ea761749428b9e.tar.gz
Minor fix to dependency dupe patch
-rw-r--r--lib/ansible/playbook/play.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
index 80aba0aca2..ea069f3221 100644
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -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: