From d3c7f3cef1c0d43b68b7c8efd7a3028d0884058e Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Thu, 3 Mar 2022 14:54:05 -0500 Subject: [PATCH] improve logging --- run-python3.js | 8 +------- venvtools.py | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/run-python3.js b/run-python3.js index 97f16c24d4f..281a8d37669 100644 --- a/run-python3.js +++ b/run-python3.js @@ -18,12 +18,6 @@ async function runPython3(scriptName, debug = "") { } runPython3(...process.argv.slice(2)).catch(err => { - const error = err.toString(); - - // Python script errors are already written out via stderr so don't - // write them twice. Write out all other errors to stderr. - if (!error.startsWith("Error: Command failed")) { - console.error(error); - } + console.error(err.toString()); process.exit(1); }); diff --git a/venvtools.py b/venvtools.py index 52b8cf7fdaf..6d7f68a7ece 100644 --- a/venvtools.py +++ b/venvtools.py @@ -62,13 +62,13 @@ def python_run(venv_context, module, command=None, *, additional_dir=".", error_ venv_context.env_exe, "-m", module ] + (command if command else []) - print("Executing: {}".format(" ".join(cmd_line)), file=sys.stderr) + print("Executing: {}".format(" ".join(cmd_line))) subprocess.run( cmd_line, cwd=_ROOT_DIR / additional_dir, check=True, ) except subprocess.CalledProcessError as err: - print(err, file=sys.stderr) + print(err) if not error_ok: sys.exit(1)