Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: mgr/PyModule: put mgr_module_path first in sys.path #26777

Merged
merged 1 commit into from May 2, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -336,8 +336,8 @@ int PyModule::load(PyThreadState *pMainThreadState)
PySys_SetArgv(1, (char**)argv);
#endif
// Configure sys.path to include mgr_module_path
string paths = (":" + get_site_packages() +
":" + g_conf->get_val<std::string>("mgr_module_path"));
string paths = (":" + g_conf->get_val<std::string>("mgr_module_path") +
":" + get_site_packages());
#if PY_MAJOR_VERSION >= 3
wstring sys_path(Py_GetPath() + wstring(begin(paths), end(paths)));
PySys_SetPath(const_cast<wchar_t*>(sys_path.c_str()));
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.