Merge pull request #1149 from dhozac/non-greedy-filepipe

Complete the change from $FILE{} to $FILE()
This commit is contained in:
Michael DeHaan 2012-09-29 13:25:32 -07:00
commit 1fd5de21d2

View file

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