wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 6506e17eff
2 changed files with 16 additions and 5 deletions
Show stats 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)

10
test/TestUtils.py
View file

@ -251,6 +251,16 @@ class TestUtils(unittest.TestCase):
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert eval(res)
def test_varReplace_repr_nonstr(self):
vars = {
'foo': True,
'bar': 1L,
}
template = '${foo} == $bar'
res = ansible.utils.varReplace(template, vars, do_repr=True)
assert res == 'True == 1L'
def test_template_varReplace_iterated(self):
template = 'hello $who'
vars = {