From 15d0166340baea91f117ea977539894e7444ee6b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
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/scripting/python/modules.c | 20 +-------------------
source4/scripting/python/modules.h | 2 +-
2 files changed, 2 insertions(+), 20 deletions(-)
(limited to 'source4/scripting/python')
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 960239e863..f2a45a9893 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -31,7 +31,7 @@ static bool PySys_PathPrepend(PyObject *list, const char *path)
return (PyList_Insert(list, 0, py_path) == 0);
}
-bool py_update_path(const char *bindir)
+bool py_update_path()
{
char *newpath;
PyObject *mod_sys, *py_path;
@@ -58,23 +58,5 @@ bool py_update_path(const char *bindir)
return false;
}
- if (asprintf(&newpath, "%s/../scripting/python", bindir) < 0) {
- return false;
- }
- if (!PySys_PathPrepend(py_path, newpath)) {
- free(newpath);
- return false;
- }
- free(newpath);
-
- if (asprintf(&newpath, "%s/python", bindir) < 0) {
- return false;
- }
- if (!PySys_PathPrepend(py_path, newpath)) {
- free(newpath);
- return false;
- }
- free(newpath);
-
return true;
}
diff --git a/source4/scripting/python/modules.h b/source4/scripting/python/modules.h
index 7c15fecabe..4e43e6de1d 100644
--- a/source4/scripting/python/modules.h
+++ b/source4/scripting/python/modules.h
@@ -20,6 +20,6 @@
#ifndef __SAMBA_PYTHON_MODULES_H__
#define __SAMBA_PYTHON_MODULES_H__
-bool py_update_path(const char *bindir);
+bool py_update_path();
#endif /* __SAMBA_PYTHON_MODULES_H__ */
--
cgit