summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/newuser6
-rwxr-xr-xsource4/setup/provision3
-rwxr-xr-xsource4/setup/upgrade.py4
3 files changed, 11 insertions, 2 deletions
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