ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #946 from dhozac/false-vars

Browse source 
Allow variable expansion for vars that evaluate to false
This commit is contained in:
Michael DeHaan 2012-08-27 18:10:04 -07:00
commit 8c0af4bc4f
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/utils.py
View file

@ -156,6 +156,9 @@ def parse_json(raw_data):
_LISTRE = re.compile(r"(\w+)\[(\d+)\]") _LISTRE = re.compile(r"(\w+)\[(\d+)\]")
class VarNotFoundException(Exception):
pass
def _varLookup(name, vars): def _varLookup(name, vars):
''' find the contents of a possibly complex variable in vars. ''' ''' find the contents of a possibly complex variable in vars. '''
@ -167,13 +170,13 @@ def _varLookup(name, vars):
elif "[" in part: elif "[" in part:
m = _LISTRE.search(part) m = _LISTRE.search(part)
if not m: if not m:
return raise VarNotFoundException()
try: try:
space = space[m.group(1)][int(m.group(2))] space = space[m.group(1)][int(m.group(2))]
except (KeyError, IndexError): except (KeyError, IndexError):
return raise VarNotFoundException()
else: else:
return raise VarNotFoundException()
return space return space
_KEYCRE = re.compile(r"\$(?P<complex>\{){0,1}((?(complex)[\w\.\[\]]+|\w+))(?(complex)\})") _KEYCRE = re.compile(r"\$(?P<complex>\{){0,1}((?(complex)[\w\.\[\]]+|\w+))(?(complex)\})")
@ -184,7 +187,10 @@ def varLookup(varname, vars):
m = _KEYCRE.search(varname) m = _KEYCRE.search(varname)
if not m: if not m:
return None return None
return _varLookup(m.group(2), vars) try:
return _varLookup(m.group(2), vars)
except VarNotFoundException:
return None
def varReplace(raw, vars): def varReplace(raw, vars):
''' Perform variable replacement of $variables in string raw using vars dictionary ''' ''' Perform variable replacement of $variables in string raw using vars dictionary '''
@ -202,7 +208,10 @@ def varReplace(raw, vars):
# original) # original)
varname = m.group(2) varname = m.group(2)
replacement = unicode(_varLookup(varname, vars) or m.group()) try:
replacement = unicode(_varLookup(varname, vars))
except VarNotFoundException:
replacement = m.group()
start, end = m.span() start, end = m.span()
done.append(raw[:start]) # Keep stuff leading up to token done.append(raw[:start]) # Keep stuff leading up to token