FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2025-01-10 10:25:23 +01:00
Code Issues Projects Releases Wiki Activity

Expand '--foo=' with shell=False - Issue #1814

Browse Source
This commit is contained in:
Thomas Nagy 2016-09-15 21:36:02 +02:00
parent f685d01217
commit 9ed7d41488
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waflib/Task.py
View File

@ -1041,7 +1041,7 @@ def compile_fun_shell(line):
Logs.debug('action: %s', c.strip().splitlines()) Logs.debug('action: %s', c.strip().splitlines())
return (funex(c), dvars) return (funex(c), dvars)
reg_act_noshell = re.compile(r"(?P<space>\s+)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})|(?P<text>\S+)", re.M) reg_act_noshell = re.compile(r"(?P<space>\s+)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})|(?P<text>([^$ \t\n\r\f\v]|\$\$)+)", re.M)
def compile_fun_noshell(line): def compile_fun_noshell(line):
""" """
Creates a compiled function to execute a process without a sub-shell Creates a compiled function to execute a process without a sub-shell
@ -1068,7 +1068,7 @@ def compile_fun_noshell(line):
merge = False merge = False
continue continue
elif m.group('text'): elif m.group('text'):
app('[%r]' % m.group('text')) app('[%r]' % m.group('text').replace('$$', '$'))
elif m.group('subst'): elif m.group('subst'):
var = m.group('var') var = m.group('var')
code = m.group('code') code = m.group('code')