Skip to content

Commit

Permalink
input.py: subprocess.Popen() -> subprocess.run()
Browse files Browse the repository at this point in the history
  • Loading branch information
FuPeiJiang committed Aug 19, 2022
1 parent 93df27b commit c3e909d
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions gyp/pylib/gyp/input.py
Expand Up @@ -961,34 +961,26 @@ def ExpandVariables(input, phase, variables, build_file):
# Fix up command with platform specific workarounds.
contents = FixupPlatformCommand(contents)
try:
p = subprocess.Popen(
# stderr will be printed no matter what
result = subprocess.run(
contents,
shell=use_shell,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
stdin=subprocess.PIPE,
shell=use_shell,
cwd=build_file_dir,
check=False
)
except Exception as e:
raise GypError(
"%s while executing command '%s' in %s"
% (e, contents, build_file)
)

p_stdout, p_stderr = p.communicate("")
p_stdout = p_stdout.decode("utf-8")
p_stderr = p_stderr.decode("utf-8")

if p_stderr:
sys.stderr.write(p_stderr)
if p.wait() != 0:
# Simulate check_call behavior, since check_call only exists
# in python 2.5 and later.
if result.returncode > 0:
raise GypError(
"Call to '%s' returned exit status %d while in %s."
% (contents, p.returncode, build_file)
% (contents, result.returncode, build_file)
)
replacement = p_stdout.rstrip()
replacement = result.stdout.decode("utf-8").rstrip()

cached_command_results[cache_key] = replacement
else:
Expand Down

0 comments on commit c3e909d

Please sign in to comment.