internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1109 from dhozac/fix-varReplace-repr

Browse Source 
Fix only_if statements referencing non-string types
This commit is contained in:
Michael DeHaan
2012-09-27 15:57:50 -07:00
parent 6c6f2b46b4 b55ef665ba
commit 6506e17eff
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/utils.py
View File

@@ -269,8 +269,9 @@ def varReplace(raw, vars, do_repr=False, depth=0):
# original)
try:
replacement = unicode(_varLookup(m.group(2), vars, depth))
replacement = varReplace(replacement, vars, depth=depth + 1)
replacement = _varLookup(m.group(2), vars, depth)
if isinstance(replacement, (str, unicode)):
replacement = varReplace(replacement, vars, depth=depth + 1)
except VarNotFoundException:
replacement = m.group()
@@ -282,9 +283,9 @@ def varReplace(raw, vars, do_repr=False, depth=0):
(raw[start - 1] == '"' and raw[end] == '"'))):
start -= 1
end += 1
done.append(raw[:start]) # Keep stuff leading up to token
done.append(replacement) # Append replacement value
raw = raw[end:] # Continue with remainder of string
done.append(raw[:start]) # Keep stuff leading up to token
done.append(unicode(replacement)) # Append replacement value
raw = raw[end:] # Continue with remainder of string
return ''.join(done)