Return original string for non-matched vars

07ba7e20 · Daniel Hokka Zakrisson · 4399d9c3 · 07ba7e20
Commit 07ba7e20 authored Nov 01, 2012 by Daniel Hokka Zakrisson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

lib/ansible/template.py
+4 -1

No files found.
--- a/lib/ansible/template.py
+++ b/lib/ansible/template.py
@@ -187,7 +187,10 @@ def varReplaceWithItems(basedir, varname, vars):
        if not m:
            return varname
        if m['start'] == 0 and m['end'] == len(varname):
-            return varReplaceWithItems(basedir, m['replacement'], vars)
+            if m['replacement'] is not None:
+                return varReplaceWithItems(basedir, m['replacement'], vars)
+            else:
+                return varname
        else:
            return template(basedir, varname, vars)
    elif isinstance(varname, (list, tuple)):