Set sys.path for running inside source tree.

(This used to be commit b507109bb676715f7d9616e13b0e19305e9c2559)

source4/scripting/bin/minschema.py

@@ -4,6 +4,10 @@
 #
 
 import optparse
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import samba
 from samba import getopt as options
 import sys

source4/scripting/bin/rpcclient

@@ -1,6 +1,10 @@
 #!/usr/bin/python
 
 import sys, os, string
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 from cmd import Cmd
 from optparse import OptionParser
 from pprint import pprint

source4/scripting/bin/samba3dump

@@ -7,7 +7,10 @@
 
 import optparse
 import os, sys
-sys.path.append(os.path.join(os.path.dirname(__file__), "../python"))
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import samba
 import samba.samba3
 

source4/scripting/bin/subunitrun

@@ -18,7 +18,9 @@
 #
 
 import sys
-sys.path.append("bin/python")
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
 
 from subunit import SubunitTestRunner
 from unittest import TestProgram

source4/scripting/bin/winreg.py

@@ -7,6 +7,10 @@
 #
 
 import sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
 import winreg
 import optparse
 import samba.getopt as options

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

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

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