From 7faa3be45359a94593d22e2bbe7eda0ddffa146c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 1 Feb 2011 14:43:34 +1100 Subject: [PATCH] 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 --- source4/auth/credentials/tests/bind.py | 2 +- source4/dsdb/tests/python/acl.py | 2 +- source4/dsdb/tests/python/deletetest.py | 2 +- source4/dsdb/tests/python/dsdb_schema_info.py | 2 +- source4/dsdb/tests/python/ldap.py | 2 +- source4/dsdb/tests/python/ldap_schema.py | 2 +- source4/dsdb/tests/python/ldap_syntaxes.py | 2 +- source4/dsdb/tests/python/passwords.py | 2 +- source4/dsdb/tests/python/sam.py | 2 +- source4/dsdb/tests/python/sec_descriptor.py | 2 +- source4/dsdb/tests/python/token_group.py | 2 +- source4/dsdb/tests/python/urgent_replication.py | 2 +- source4/scripting/devel/speedtest.py | 2 +- source4/torture/drs/python/delete_object.py | 2 +- source4/torture/drs/python/fsmo.py | 2 +- source4/torture/drs/python/repl_schema.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source4/auth/credentials/tests/bind.py b/source4/auth/credentials/tests/bind.py index a10c91956f4..1529a475c71 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 d2c411643f9..2902f255011 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 91257959982..80c69374833 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 dc82fe071cb..28fce1b00f4 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 902dfb77d8b..2b7e8fa4d1e 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 3dcbb72a023..a6503e26392 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 04b95d7a8a8..64e0c421c14 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 70bca933f6e..0db5e8c10c4 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 69dd7570482..a623ebc384f 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 de71daee69d..2db33ae340c 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 e3ffbac2d54..62bdbd5ee03 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 bf92d0a9682..3759c82de87 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 a7adfbace17..fed270527a0 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 ccc412e1712..c52060f9433 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 4dc573b89c3..d7b3c1671da 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 a98452ed13f..db14c37adf1 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") -- 2.11.4.GIT