diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 13:49:29 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:00 +1100 |
| commit | e7b2e06130fd74a539c58a48c870c9fa1961f699 (patch) | |
| tree | caa0bef1eaf9883e1b11f4e017f030dc52968424 /source4/scripting/python/samba/provision | |
| parent | 72e1a39effba7dca8d437c8cad009be6fb2c4506 (diff) | |
| download | samba-e7b2e06130fd74a539c58a48c870c9fa1961f699.tar.gz samba-e7b2e06130fd74a539c58a48c870c9fa1961f699.tar.xz samba-e7b2e06130fd74a539c58a48c870c9fa1961f699.zip | |
s4-provision: cope with top level directory for provision
to allow for top level 'make test' we need to cope with two in-tree
directory layouts
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/provision')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index e200083a33..341f822cf2 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -47,6 +47,7 @@ from samba import ( Ldb, check_all_substituted, in_source_tree, + source_tree_topdir, read_and_sub_file, setup_file, substitute_var, @@ -89,8 +90,7 @@ def find_setup_dir(): """Find the setup directory used by provision.""" if in_source_tree(): # In source tree - dirname = os.path.dirname(__file__) - return os.path.normpath(os.path.join(dirname, "../../../../setup")) + return os.path.join(source_tree_topdir(), "source4/setup") else: import sys for prefix in [sys.prefix, |