Return original string for non-matched vars

parent 4399d9c3
...@@ -187,7 +187,10 @@ def varReplaceWithItems(basedir, varname, vars): ...@@ -187,7 +187,10 @@ def varReplaceWithItems(basedir, varname, vars):
if not m: if not m:
return varname return varname
if m['start'] == 0 and m['end'] == len(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: else:
return template(basedir, varname, vars) return template(basedir, varname, vars)
elif isinstance(varname, (list, tuple)): elif isinstance(varname, (list, tuple)):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment