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

10 years ago · 439a385215
parent 7bfb689de2
commit 439a385215
1 changed files with 7 additions and 1 deletions
--- a/lib/ansible/template/init.py
+++ b/lib/ansible/template/init.py
@ -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: