summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-01 14:43:34 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-02 15:21:12 +1100
commit7faa3be45359a94593d22e2bbe7eda0ddffa146c (patch)
tree7ee07ec41df08a2f9b5032d5997b671820aacdfc /source4
parent38aacd7a7bc551797d8c60cc695fc4922941add9 (diff)
downloadsamba-7faa3be45359a94593d22e2bbe7eda0ddffa146c.tar.gz
samba-7faa3be45359a94593d22e2bbe7eda0ddffa146c.tar.bz2
samba-7faa3be45359a94593d22e2bbe7eda0ddffa146c.zip
s4-python Ensure we add the Samba python path first.
This exact form of the construction is important, and we match on it in the installation scripts. Andrew Bartlett
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/auth/credentials/tests/bind.py2
-rwxr-xr-xsource4/dsdb/tests/python/acl.py2
-rwxr-xr-xsource4/dsdb/tests/python/deletetest.py2
-rwxr-xr-xsource4/dsdb/tests/python/dsdb_schema_info.py2
-rwxr-xr-xsource4/dsdb/tests/python/ldap.py2
-rwxr-xr-xsource4/dsdb/tests/python/ldap_schema.py2
-rw-r--r--source4/dsdb/tests/python/ldap_syntaxes.py2
-rwxr-xr-xsource4/dsdb/tests/python/passwords.py2
-rwxr-xr-xsource4/dsdb/tests/python/sam.py2
-rwxr-xr-xsource4/dsdb/tests/python/sec_descriptor.py2
-rwxr-xr-xsource4/dsdb/tests/python/token_group.py2
-rwxr-xr-xsource4/dsdb/tests/python/urgent_replication.py2
-rwxr-xr-xsource4/scripting/devel/speedtest.py2
-rw-r--r--source4/torture/drs/python/delete_object.py2
-rw-r--r--source4/torture/drs/python/fsmo.py2
-rw-r--r--source4/torture/drs/python/repl_schema.py2
16 files changed, 16 insertions, 16 deletions
diff --git a/source4/auth/credentials/tests/bind.py b/source4/auth/credentials/tests/bind.py
index a10c91956f..1529a475c7 100755
--- a/source4/auth/credentials/tests/bind.py
+++ b/source4/auth/credentials/tests/bind.py
@@ -10,7 +10,7 @@ import os
import copy
import time
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index d2c411643f..2902f25501 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -6,7 +6,7 @@ import optparse
import sys
import base64
import re
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index 9125795998..80c6937483 100755
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -5,7 +5,7 @@ import optparse
import sys
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/dsdb_schema_info.py b/source4/dsdb/tests/python/dsdb_schema_info.py
index dc82fe071c..28fce1b00f 100755
--- a/source4/dsdb/tests/python/dsdb_schema_info.py
+++ b/source4/dsdb/tests/python/dsdb_schema_info.py
@@ -29,7 +29,7 @@ import sys
import time
import random
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 902dfb77d8..2b7e8fa4d1 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -8,7 +8,7 @@ import time
import base64
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index 3dcbb72a02..a6503e2639 100755
--- a/source4/dsdb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
@@ -8,7 +8,7 @@ import time
import random
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py
index 04b95d7a8a..64e0c421c1 100644
--- a/source4/dsdb/tests/python/ldap_syntaxes.py
+++ b/source4/dsdb/tests/python/ldap_syntaxes.py
@@ -8,7 +8,7 @@ import time
import random
import uuid
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 70bca933f6..0db5e8c10c 100755
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -14,7 +14,7 @@ import base64
import time
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 69dd757048..a623ebc384 100755
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -6,7 +6,7 @@ import optparse
import sys
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index de71daee69..2db33ae340 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -8,7 +8,7 @@ import base64
import re
import random
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index e3ffbac2d5..62bdbd5ee0 100755
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -6,7 +6,7 @@ import optparse
import sys
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index bf92d0a968..3759c82de8 100755
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -5,7 +5,7 @@ import optparse
import sys
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/scripting/devel/speedtest.py b/source4/scripting/devel/speedtest.py
index a7adfbace1..fed270527a 100755
--- a/source4/scripting/devel/speedtest.py
+++ b/source4/scripting/devel/speedtest.py
@@ -28,7 +28,7 @@ import time
import base64
from decimal import Decimal
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py
index ccc412e171..c52060f943 100644
--- a/source4/torture/drs/python/delete_object.py
+++ b/source4/torture/drs/python/delete_object.py
@@ -30,7 +30,7 @@ import sys
import time
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
from ldb import (
SCOPE_BASE,
diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py
index 4dc573b89c..d7b3c1671d 100644
--- a/source4/torture/drs/python/fsmo.py
+++ b/source4/torture/drs/python/fsmo.py
@@ -29,7 +29,7 @@ import sys
import time
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
from ldb import SCOPE_BASE
diff --git a/source4/torture/drs/python/repl_schema.py b/source4/torture/drs/python/repl_schema.py
index a98452ed13..db14c37adf 100644
--- a/source4/torture/drs/python/repl_schema.py
+++ b/source4/torture/drs/python/repl_schema.py
@@ -32,7 +32,7 @@ import time
import random
import os
-sys.path.append("bin/python")
+sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")