forked from bartvdbraak/blender
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
This commit is contained in:
parent
a9dd6d004b
commit
79a58eef05
@ -279,9 +279,10 @@ void BPY_python_start(int argc, const char **argv)
|
|||||||
* While harmless, it's noisy. */
|
* While harmless, it's noisy. */
|
||||||
Py_FrozenFlag = 1;
|
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. */
|
* Since an incorrect 'PYTHONPATH' causes difficult to debug errors, see: T72807. */
|
||||||
Py_IgnoreEnvironmentFlag = !py_use_system_env;
|
Py_IgnoreEnvironmentFlag = !py_use_system_env;
|
||||||
|
Py_NoUserSiteDirectory = !py_use_system_env;
|
||||||
|
|
||||||
Py_Initialize();
|
Py_Initialize();
|
||||||
|
|
||||||
|
@ -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[] =
|
static const char arg_handle_python_use_system_env_set_doc[] =
|
||||||
"\n\t"
|
"\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),
|
static int arg_handle_python_use_system_env_set(int UNUSED(argc),
|
||||||
const char **UNUSED(argv),
|
const char **UNUSED(argv),
|
||||||
void *UNUSED(data))
|
void *UNUSED(data))
|
||||||
|
Loading…
Reference in New Issue
Block a user