summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-05 18:00:45 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-07 13:22:02 +1100
commit15d0166340baea91f117ea977539894e7444ee6b (patch)
tree65838dc452590393024dd487af488417c0b5351f /source4/param
parent19c3546872216980ff49e5b3dbffb01433c07552 (diff)
downloadsamba-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/param')
-rw-r--r--source4/param/provision.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/param/provision.c b/source4/param/provision.c
index e4236a59c5..7b6e6e74b3 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -84,7 +84,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
DEBUG(0,("Provision for Become-DC test using python\n"));
Py_Initialize();
- 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 */
provision_mod = provision_module();
@@ -240,7 +240,7 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
}
Py_Initialize();
- 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 */
provision_mod = provision_module();
if (provision_mod == NULL) {
@@ -336,7 +336,7 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_co
PyObject *schema_mod, *schema_dict, *schema_fn, *py_result, *parameters;
Py_Initialize();
- 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 */
schema_mod = schema_module();