From e11bb77f31827f875b536c4dfed18343bcf8f458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 8 Jan 2019 12:00:18 +0100 Subject: Properly clean up Python when exiting due to --python-exit-code When BPY_python_end() is not called, there can be buffered data still in `sys.stdout` or `sys.stderr`. This generally isn't an issue when those are connected to a terminal, but when they are read by another process (in the case of rendering with Flamenco, for example) we could miss the actual error message that's causing the exit in the first place. The following script demonstrates the issue; before this commit neither the writes to STDERR and STDOUT nor the traceback of the NameError were shown. #!/bin/bash cat > file-with-errors.py <&1 | cat Reviewers: campbellbarton, mont29 Reviewed By: campbellbarton, mont29 Subscribers: fsiddi Differential Revision: https://developer.blender.org/D4168 --- source/creator/creator_args.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/creator') diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 5b976515dd8..fe67eff3c40 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1615,6 +1615,7 @@ static int arg_handle_python_file_run(int argc, const char **argv, void *data) BPY_CTX_SETUP(ok = BPY_execute_filepath(C, filename, NULL)); if (!ok && app_state.exit_code_on_error.python) { printf("\nError: script failed, file: '%s', exiting.\n", argv[1]); + BPY_python_end(); exit(app_state.exit_code_on_error.python); } return 1; @@ -1656,6 +1657,7 @@ static int arg_handle_python_text_run(int argc, const char **argv, void *data) if (!ok && app_state.exit_code_on_error.python) { printf("\nError: script failed, text: '%s', exiting.\n", argv[1]); + BPY_python_end(); exit(app_state.exit_code_on_error.python); } @@ -1687,6 +1689,7 @@ static int arg_handle_python_expr_run(int argc, const char **argv, void *data) BPY_CTX_SETUP(ok = BPY_execute_string_ex(C, NULL, argv[1], false)); if (!ok && app_state.exit_code_on_error.python) { printf("\nError: script failed, expr: '%s', exiting.\n", argv[1]); + BPY_python_end(); exit(app_state.exit_code_on_error.python); } return 1; -- cgit v1.2.3