summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-01 14:58:11 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-02 15:21:13 +1100
commitdbe0b078492ea20da2b0aa3bb1d1c6138d16454e (patch)
treeeda9e3f2705b97b6e401b91f585bc6eefd93fbe4 /source4
parent7faa3be45359a94593d22e2bbe7eda0ddffa146c (diff)
downloadsamba-dbe0b078492ea20da2b0aa3bb1d1c6138d16454e.tar.gz
samba-dbe0b078492ea20da2b0aa3bb1d1c6138d16454e.tar.bz2
samba-dbe0b078492ea20da2b0aa3bb1d1c6138d16454e.zip
s4-python Remove manipuation of python path from samba module
This manipulation should be done by top level scripts, otherwise we won't find samba in the first place (and these can be munged correctly for the install). Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index 5294368b6d..5faeef05cf 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -32,10 +32,9 @@ def in_source_tree():
return os.path.exists("%s/../../../selftest/skip" % os.path.dirname(__file__))
-# When running, in-tree, make sure bin/python is in the PYTHONPATH
+# When running, in-tree, make sure ldb modules can be found
if in_source_tree():
srcdir = "%s/../../.." % os.path.dirname(__file__)
- sys.path.append("%s/bin/python" % srcdir)
default_ldb_modules_dir = "%s/bin/modules/ldb" % srcdir
else:
default_ldb_modules_dir = None