Merge pull request #6150 from hkariti/fix_join_bug

Fix incorrect use of .join on list causing a traceback
11 years ago · b758ed9417
parent f5359c310f ae9c0d87a9
commit b758ed9417
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@ -278,7 +278,7 @@ class Play(object):
                                    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'])