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

Catch TypeError on join, and if caught just return a single item, or a list of many

Browse source
This commit is contained in:
Matt Martz 2016-02-18 15:17:42 -06:00
parent 7bfb689de2
commit 439a385215
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/template/__init__.py
View file

@ -420,7 +420,13 @@ class Templar:
if wantlist:
ran = wrap_var(ran)
else:
ran = UnsafeProxy(",".join(ran))
try:
ran = UnsafeProxy(",".join(ran))
except TypeError:
if isinstance(ran, list) and len(ran) == 1:
ran = wrap_var(ran[0])
else:
ran = wrap_var(ran)
return ran
else: