From babdcc6135e6d3a91a9ddeae0555652026f09344 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 11 May 2008 05:29:20 +0200 Subject: Use system python rather than smbpython. (This used to be commit d3df51cd01e53383dcc05923d248db03bc6f62e9) --- source4/setup/provision | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/setup') diff --git a/source4/setup/provision b/source4/setup/provision index b748dab339..ad289aaaa3 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -26,6 +26,8 @@ import getopt import optparse import os, sys +sys.path.append("bin/python") + import samba import param -- cgit From 47d22189227c0dd6f2f370ade2cfb878eef0f240 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 11 May 2008 05:45:49 +0200 Subject: Set sys.path for running inside source tree. (This used to be commit b507109bb676715f7d9616e13b0e19305e9c2559) --- source4/setup/newuser | 6 +++++- source4/setup/provision | 3 ++- source4/setup/upgrade.py | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'source4/setup') diff --git a/source4/setup/newuser b/source4/setup/newuser index 04a5440ee1..26bac76f02 100755 --- a/source4/setup/newuser +++ b/source4/setup/newuser @@ -6,10 +6,14 @@ # Released under the GNU GPL version 3 or later # +import sys + +# Find right directory when running from source tree +sys.path.insert(0, "bin/python") + import samba.getopt as options import optparse import pwd -import sys from getpass import getpass from auth import system_session from samba.samdb import SamDB diff --git a/source4/setup/provision b/source4/setup/provision index ad289aaaa3..2579bc4f19 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -26,7 +26,8 @@ import getopt import optparse import os, sys -sys.path.append("bin/python") +# Find right directory when running from source tree +sys.path.insert(0, "bin/python") import samba import param diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py index 3bcc57ab64..b1d9ffa37c 100755 --- a/source4/setup/upgrade.py +++ b/source4/setup/upgrade.py @@ -7,6 +7,10 @@ import getopt import optparse import os, sys + +# Find right directory when running from source tree +sys.path.insert(0, "bin/python") + import param import samba import samba.getopt as options -- cgit