diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-05 18:00:45 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:02 +1100 |
| commit | 15d0166340baea91f117ea977539894e7444ee6b (patch) | |
| tree | 65838dc452590393024dd487af488417c0b5351f /source4/web_server | |
| parent | 19c3546872216980ff49e5b3dbffb01433c07552 (diff) | |
| download | samba-15d0166340baea91f117ea977539894e7444ee6b.tar.gz | |
s4-python Don't force "bin" into the python sys.path
This patch uses the fact that dyn_PYTHONDIR and dyn_PYTHONARCHDIR is
now set properly at all times, incluidng for installed and
build-directory binaries. So we don't need to make assumptions about
bin being magic any more.
Andrew Bartlett
Diffstat (limited to 'source4/web_server')
| -rw-r--r-- | source4/web_server/wsgi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index 2f47af2d257..37ded294801 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -385,7 +385,8 @@ bool wsgi_initialize(struct web_server_data *wdata) Py_Initialize(); - py_update_path("bin"); /* FIXME: Can't assume this is always the case */ + py_update_path(); /* Ensure that we have the Samba paths at + * the start of the sys.path() */ if (PyType_Ready(&web_request_Type) < 0) return false; |