summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/provisionbackend.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-03-01 05:04:23 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-03-01 16:24:58 +0100
commit86e2b251861055d770327639808fddc84cdb0b56 (patch)
treeb7e882711fe8a18fd67f9bd4cd07ad2ab8d565ab /source4/scripting/python/samba/provisionbackend.py
parent719cecba848b3e446ea3bc06f14cf90e9cddab9e (diff)
downloadsamba-86e2b251861055d770327639808fddc84cdb0b56.tar.gz
samba-86e2b251861055d770327639808fddc84cdb0b56.tar.xz
samba-86e2b251861055d770327639808fddc84cdb0b56.zip
More formatting fixes, pointed out by pylint.
Diffstat (limited to 'source4/scripting/python/samba/provisionbackend.py')
-rw-r--r--source4/scripting/python/samba/provisionbackend.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 649113e6a2..083f1dc73d 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -119,7 +119,7 @@ class ExistingBackend(ProvisionBackend):
def init(self):
#Check to see that this 'existing' LDAP backend in fact exists
ldapi_db = Ldb(self.ldapi_uri, credentials=self.credentials)
- search_ol_rootdse = ldapi_db.search(base="", scope=SCOPE_BASE,
+ ldapi_db.search(base="", scope=SCOPE_BASE,
expression="(objectClass=OpenLDAProotDSE)")
# If we have got here, then we must have a valid connection to the LDAP server, with valid credentials supplied
@@ -170,7 +170,7 @@ class LDAPBackend(ProvisionBackend):
try:
ldapi_db = Ldb(self.ldapi_uri)
ldapi_db.search(base="", scope=SCOPE_BASE,
- expression="(objectClass=OpenLDAProotDSE)");
+ expression="(objectClass=OpenLDAProotDSE)")
try:
f = open(self.paths.slapdpid, "r")
p = f.read()
@@ -204,7 +204,7 @@ class LDAPBackend(ProvisionBackend):
except OSError:
pass
- self.schema.write_to_tmp_ldb(schemadb_path);
+ self.schema.write_to_tmp_ldb(schemadb_path)
self.credentials = Credentials()
self.credentials.guess(self.lp)
@@ -243,7 +243,6 @@ class LDAPBackend(ProvisionBackend):
return
except LdbError:
time.sleep(1)
- pass
raise ProvisioningError("slapd died before we could make a connection to it")
@@ -297,7 +296,7 @@ class OpenLDAPBackend(LDAPBackend):
self.domainsid,
schemadn=self.names.schemadn,
serverdn=self.names.serverdn,
- files=[setup_path("schema_samba4.ldif")]);
+ files=[setup_path("schema_samba4.ldif")])
def provision(self):
# Wipe the directories so we can start
@@ -674,7 +673,7 @@ class FDSBackend(LDAPBackend):
fedora_ds_dir = os.path.join(self.paths.ldapdir, "slapd-samba4")
shutil.rmtree(fedora_ds_dir, True)
- self.slapd_provision_command = [self.slapd_path, "-D", fedora_ds_dir, "-i", self.paths.slapdpid];
+ self.slapd_provision_command = [self.slapd_path, "-D", fedora_ds_dir, "-i", self.paths.slapdpid]
#In the 'provision' command line, stay in the foreground so we can easily kill it
self.slapd_provision_command.append("-d0")