From 15d0166340baea91f117ea977539894e7444ee6b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 5 Feb 2011 18:00:45 +1100 Subject: 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 --- source4/samba_tool/samba_tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/samba_tool/samba_tool.c') 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) { -- cgit