diff options
| author | Brecht Van Lommel <brecht> | 2020-04-16 16:54:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-16 16:58:31 +0300 |
| commit | 79a58eef059ffc3f12d11bd68938cfb1b4cd2462 (patch) | |
| tree | e4b6203d6e844fbcd3e5f02a3828cb06c1e4bc1e /source | |
| parent | a9dd6d004b4f6798e62618dd6cf87369509b33a6 (diff) | |
Fix T73977, T73825: ignore Python user site-packages directory by default
This goes along with the existing changes to ignore PYTHONPATH by default.
--python-use-system-env now controls both.
Differential Revision: https://developer.blender.org/D6962
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/intern/bpy_interface.c | 3 | ||||
| -rw-r--r-- | source/creator/creator_args.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index b09d3187f3c..6da1715b02d 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -279,9 +279,10 @@ void BPY_python_start(int argc, const char **argv) * While harmless, it's noisy. */ Py_FrozenFlag = 1; - /* Only use the systems environment variables when explicitly requested. + /* Only use the systems environment variables and site when explicitly requested. * Since an incorrect 'PYTHONPATH' causes difficult to debug errors, see: T72807. */ Py_IgnoreEnvironmentFlag = !py_use_system_env; + Py_NoUserSiteDirectory = !py_use_system_env; Py_Initialize(); diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 381a43ff521..a13733fd897 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1924,7 +1924,8 @@ static int arg_handle_python_exit_code_set(int argc, const char **argv, void *UN static const char arg_handle_python_use_system_env_set_doc[] = "\n\t" - "Allow Python to use system environment variables such as 'PYTHONPATH'."; + "Allow Python to use system environment variables such as 'PYTHONPATH' and the user " + "site-packages directory."; static int arg_handle_python_use_system_env_set(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) |