From 77de5fb2d02551eb7563ba1a42c74ad6581815fb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 2 Jan 2019 15:52:08 +0100 Subject: setup.py: Fix running under non-UTF8 locale Redirecting stderr to stdout causes an error when running under non-UTF8 locales. For the build scripts, it is also not desired to mix the output channels, so, remove the redirection. Change-Id: I6e3d05ede00537c3cc4c022780e8d0ed27bb0cad Fixes: PYSIDE-880 Reviewed-by: Alexandru Croitor --- build_scripts/utils.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'build_scripts/utils.py') diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 924b698dc..9500b3409 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -399,10 +399,9 @@ def run_process_output(args, initial_env=None): result.append(line.rstrip()) return result -def run_process(args, initial_env=None, redirect_stderr_to_stdout=True): +def run_process(args, initial_env=None): """ Run process until completion and return the process exit code. - Prints both stdout and stderr to the console. No output is captured. """ log.info("Running process in directory {0}: command {1}".format( @@ -415,8 +414,6 @@ def run_process(args, initial_env=None, redirect_stderr_to_stdout=True): kwargs = {} kwargs['env'] = initial_env - if redirect_stderr_to_stdout: - kwargs['stderr'] = subprocess.STDOUT exit_code = subprocess.call(args, **kwargs) return exit_code -- cgit v1.2.3