diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-12 03:54:53 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-12 03:54:53 +0200 |
commit | 4accab35c66cbca5691e81d50215a48f25a8be30 (patch) | |
tree | cbd875aff67cf4889ef76091c1a13b760a5e912c /source4/scripting/bin | |
parent | 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff) | |
parent | 826dadf4f24765cdd437c29c035496ae6793761c (diff) | |
download | samba-4accab35c66cbca5691e81d50215a48f25a8be30.tar.gz samba-4accab35c66cbca5691e81d50215a48f25a8be30.tar.bz2 samba-4accab35c66cbca5691e81d50215a48f25a8be30.zip |
Merge branch 'nosmbpython' into v4-0-test
(This used to be commit 9683f7434c7ea01631d8adae9d43274c77ff51de)
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-x | source4/scripting/bin/minschema.py | 4 | ||||
-rwxr-xr-x | source4/scripting/bin/rpcclient | 4 | ||||
-rwxr-xr-x | source4/scripting/bin/samba3dump | 5 | ||||
-rwxr-xr-x | source4/scripting/bin/subunitrun | 6 | ||||
-rwxr-xr-x | source4/scripting/bin/winreg.py | 4 |
5 files changed, 21 insertions, 2 deletions
diff --git a/source4/scripting/bin/minschema.py b/source4/scripting/bin/minschema.py index fb9d7b05aa..6dd5b42aff 100755 --- a/source4/scripting/bin/minschema.py +++ b/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 diff --git a/source4/scripting/bin/rpcclient b/source4/scripting/bin/rpcclient index 34efafdf73..aba4f9ddb3 100755 --- a/source4/scripting/bin/rpcclient +++ b/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 diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump index 8f56d423d8..d89667233f 100755 --- a/source4/scripting/bin/samba3dump +++ b/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 diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index fbbffde42c..de11aba3cc 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -17,8 +17,12 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from subunit import SubunitTestRunner import sys + +# Find right directory when running from source tree +sys.path.insert(0, "bin/python") + +from subunit import SubunitTestRunner from unittest import TestProgram import optparse import os diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py index 1e39ee8f78..19d39e56ab 100755 --- a/source4/scripting/bin/winreg.py +++ b/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 |