From f36a9afc2f62827700e4b8b441448aef00439f7d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 19 Jun 2010 13:41:48 +0200 Subject: s4-python: Use sys.prefix rather than guessing prefix from current file path. --- source4/scripting/python/samba/provision.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 7fa5dbbdd7..bfa1b952d4 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -64,14 +64,13 @@ __docformat__ = "restructuredText" def find_setup_dir(): """Find the setup directory used by provision.""" - dirname = os.path.dirname(__file__) - if "/site-packages/" in dirname: - prefix = "/".join(dirname[:dirname.index("/site-packages/")].split("/")[:-2]) - for suffix in ["share/setup", "share/samba/setup", "setup"]: - ret = os.path.join(prefix, suffix) - if os.path.isdir(ret): - return ret + import sys + for suffix in ["share/setup", "share/samba/setup", "setup"]: + ret = os.path.join(sys.prefix, suffix) + if os.path.isdir(ret): + return ret # In source tree + dirname = os.path.dirname(__file__) ret = os.path.join(dirname, "../../../setup") if os.path.isdir(ret): return ret -- cgit