diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 14:39:19 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 17:37:51 +1000 |
| commit | f67a14976bd6ccdacd319df872e6add994f0e0f3 (patch) | |
| tree | 09b416c3c1fd041d9e19d3df3b6b52150ef3e5b9 /source4/scripting | |
| parent | de46ad9084aff4384f33660acf91da3b81554a88 (diff) | |
| download | samba-f67a14976bd6ccdacd319df872e6add994f0e0f3.tar.gz samba-f67a14976bd6ccdacd319df872e6add994f0e0f3.tar.bz2 samba-f67a14976bd6ccdacd319df872e6add994f0e0f3.zip | |
s4-param Remove 'modules dir'
The Samba waf build ensures that dyn_MODULESDIR is always correct
(even for in-tree binaries), so we don't need to allow the user to
configure this at run time.
Andrew Bartlett
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index dac69e7f62..76eb44ce92 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -26,6 +26,7 @@ __docformat__ = "restructuredText" import os import sys +import samba.param def source_tree_topdir(): '''return the top level directory (the one containing the source4 directory)''' @@ -77,8 +78,8 @@ class Ldb(_Ldb): if modules_dir is not None: self.set_modules_dir(modules_dir) - elif lp is not None: - self.set_modules_dir(os.path.join(lp.get("modules dir"), "ldb")) + else: + self.set_modules_dir(os.path.join(samba.param.modules_dir(), "ldb")) if session_info is not None: self.set_session_info(session_info) |