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/samba_tool/samba_tool.c | |
| parent | 19c3546872216980ff49e5b3dbffb01433c07552 (diff) | |
| download | samba-15d0166340baea91f117ea977539894e7444ee6b.tar.gz samba-15d0166340baea91f117ea977539894e7444ee6b.tar.bz2 samba-15d0166340baea91f117ea977539894e7444ee6b.zip | |
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/samba_tool/samba_tool.c')
| -rw-r--r-- | source4/samba_tool/samba_tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/samba_tool/samba_tool.c b/source4/samba_tool/samba_tool.c index da08a716ce..411eb6d98d 100644 --- a/source4/samba_tool/samba_tool.c +++ b/source4/samba_tool/samba_tool.c @@ -308,7 +308,7 @@ static int binary_net(int argc, const char **argv) } Py_Initialize(); PySys_SetArgv(argc, discard_const_p(char *, argv)); - py_update_path("bin"); /* FIXME: Can't assume this is always the case */ + py_update_path(); /* Put the Samba path at the start of sys.path */ py_cmds = py_commands(); if (py_cmds == NULL) { |