Skip to content

Commit 51db7dc

Browse files
committed
Also output stderr if quiet installation fails
1 parent 4dea497 commit 51db7dc

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

graalpython/lib-graalpython/modules/ginstall.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,14 @@ def run_cmd(args, msg="", failOnError=True, cwd=None, env=None, quiet=False, **k
105105
print("+", cwd_log, ' '.join(args))
106106
result = subprocess.run(args, cwd=cwd, env=env, capture_output=quiet, **kwargs)
107107
if failOnError and result.returncode != 0:
108-
xit(os.linesep.join((msg, str(result.stdout))), status=result.returncode)
108+
xit_msg = [msg]
109+
if result.stdout:
110+
xit_msg.append("stdout:")
111+
xit_msg.append(result.stdout.decode("utf-8"))
112+
if result.stderr:
113+
xit_msg.append("stderr:")
114+
xit_msg.append(result.stderr.decode("utf-8"))
115+
xit(os.linesep.join(xit_msg), status=result.returncode)
109116
return result.returncode
110117

111118
def known_packages():

0 commit comments

Comments
 (0)