FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Fix possible crash in ctx.cmd_and_log() when verbose mode is on (same as previous fix to exec_command)

See merge request ita1024/waf!2364
This commit is contained in:
ita1024 2024-01-12 13:26:57 +00:00
parent a8b4a5ff17 6730d9b140
commit b11202c178
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
waflib/Context.py
View File

@ -426,7 +426,10 @@ class Context(ctx):
to_ret = kw.pop('output', STDOUT)
if Logs.verbose and not kw['shell'] and not Utils.check_exe(cmd[0], env=kw.get('env', os.environ)):
raise Errors.WafError('Program %r not found!' % cmd[0])
# This call isn't a shell command, and if the specified exe doesn't exist, check for a relative path being set
# with cwd and if so assume the caller knows what they're doing and don't pre-emptively fail
if not (cmd[0][0] == '.' and 'cwd' in kw):
raise Errors.WafError('Program %s not found!' % cmd[0])
kw['stdout'] = kw['stderr'] = subprocess.PIPE
if quiet is None: