cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change $FILE{} and $PIPE{} to $FILE() and $PIPE()

Browse source
This commit is contained in:
Michael DeHaan 2012-09-18 21:34:55 -04:00 committed by Daniel Hokka Zakrisson
parent cc948f339c
commit 4ded8cb3b3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils.py
View file

@ -220,7 +220,7 @@ def varReplace(raw, vars):
return ''.join(done) return ''.join(done)
_FILEPIPECRE = re.compile(r"\$(?P<special>FILE|PIPE)\{([^\}]+)\}") _FILEPIPECRE = re.compile(r"\$(?P<special>FILE|PIPE)\(([^\}]+)\)")
def varReplaceFilesAndPipes(basedir, raw): def varReplaceFilesAndPipes(basedir, raw):
done = [] # Completed chunks to return done = [] # Completed chunks to return

4
test/TestUtils.py
View file

@ -214,14 +214,14 @@ class TestUtils(unittest.TestCase):
assert res == u'hello oh great one' assert res == u'hello oh great one'
def test_varReplace_include(self): def test_varReplace_include(self):
template = 'hello $FILE{world}' template = 'hello $FILE(world)'
res = ansible.utils.template("test", template, {}) res = ansible.utils.template("test", template, {})
assert res == u'hello world\n' assert res == u'hello world\n'
def test_varReplace_include_script(self): def test_varReplace_include_script(self):
template = 'hello $PIPE{echo world}' template = 'hello $PIPE(echo world)'
res = ansible.utils.template("test", template, {}) res = ansible.utils.template("test", template, {})