Author: jelmer Date: 2007-12-17 08:36:39 +0000 (Mon, 17 Dec 2007) New Revision: 26499
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26499 Log: Allow testing python provision by setting the PROVISION_PYTHON environment variable. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/scripting/python/samba/provision.py branches/SAMBA_4_0/source/selftest/env/Samba4.pm Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/scripting/python/samba/provision.py =================================================================== --- branches/SAMBA_4_0/source/scripting/python/samba/provision.py 2007-12-17 08:32:00 UTC (rev 26498) +++ branches/SAMBA_4_0/source/scripting/python/samba/provision.py 2007-12-17 08:36:39 UTC (rev 26499) @@ -189,7 +189,6 @@ ldb.connect(ldb.filename) - def open_ldb(session_info, credentials, dbname): assert session_info is not None try: @@ -641,25 +640,16 @@ return subobj - def load_schema(setup_dir, subobj, samdb): """Load schema.""" src = os.path.join(setup_dir, "schema.ldif") - schema_data = open(src, 'r').read() - src = os.path.join(setup_dir, "schema_samba4.ldif") - schema_data += open(src, 'r').read() - schema_data = substitute_var(schema_data, subobj.subst_vars()) - src = os.path.join(setup_dir, "provision_schema_basedn_modify.ldif") - head_data = open(src, 'r').read() - head_data = substitute_var(head_data, subobj.subst_vars()) - samdb.attach_dsdb_schema_from_ldif(head_data, schema_data) Modified: branches/SAMBA_4_0/source/selftest/env/Samba4.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-17 08:32:00 UTC (rev 26498) +++ branches/SAMBA_4_0/source/selftest/env/Samba4.pm 2007-12-17 08:36:39 UTC (rev 26499) @@ -628,8 +628,12 @@ my @provision_options = (); push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\""); push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\""); - push (@provision_options, "$self->{bindir}/smbscript"); - push (@provision_options, "$self->{setupdir}/provision"); + if (defined($ENV{PROVISION_PYTHON})) { + push (@provision_options, "$self->{setupdir}/provision.py"); + } else { + push (@provision_options, "$self->{bindir}/smbscript"); + push (@provision_options, "$self->{setupdir}/provision"); + } push (@provision_options, split(' ', $configuration)); push (@provision_options, "--host-name=$netbiosname"); push (@provision_options, "--host-ip=$ifaceipv4");