cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6150 from hkariti/fix_join_bug

Browse source 
Fix incorrect use of .join on list causing a traceback
This commit is contained in:
James Cammarata 2014-02-26 12:50:07 -06:00
parent f5359c310f ae9c0d87a9
commit b758ed9417
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/play.py
View file

@ -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'])