Merge pull request ansible#6150 from hkariti/fix_join_bug

Fix incorrect use of .join on list causing a traceback
garetharmstronghp · Feb 26, 2014 · b758ed9 · b758ed9
2 parents f5359c3 + ae9c0d8
commit b758ed9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
@@ -278,7 +278,7 @@ def _build_role_dependencies(self, roles, dep_stack, passed_vars={}, level=0):
                                     if type(passed_vars['when']) is str:
                                         tmpcond.append(passed_vars['when'])
                                     elif type(passed_vars['when']) is list:
-                                        tmpcond.join(passed_vars['when'])
+                                        tmpcond += passed_vars['when']
 
                                     if type(dep_vars['when']) is str:
                                         tmpcond.append(dep_vars['when'])