summaryrefslogtreecommitdiff
path: root/source4/scripting/python/samba/provision.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-04-08 21:01:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-04-08 23:20:36 +0200
commitdd4ef4e106d372cfadf7b47db8bf9dc25728b3bc (patch)
treeb8c6633312ee59748fe11e665516c63969e15680 /source4/scripting/python/samba/provision.py
parenta35d876537eb301d75a254d9da97268d041da8d6 (diff)
downloadsamba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.tar.gz
samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.tar.bz2
samba-dd4ef4e106d372cfadf7b47db8bf9dc25728b3bc.zip
s4-python: More cleanups.
Diffstat (limited to 'source4/scripting/python/samba/provision.py')
-rw-r--r--source4/scripting/python/samba/provision.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 71c04cfef9..abbcf52210 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -269,7 +269,8 @@ def setup_ldb(ldb, ldif_path, subst_vars):
except:
ldb.transaction_cancel()
raise
- ldb.transaction_commit()
+ else:
+ ldb.transaction_commit()
def provision_paths_from_lp(lp, dnsdomain):
@@ -550,12 +551,11 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
message("Setting up sam.ldb rootDSE")
setup_samdb_rootdse(samdb, setup_path, names)
-
except:
samdb.transaction_cancel()
raise
-
- samdb.transaction_commit()
+ else:
+ samdb.transaction_commit()
def secretsdb_self_join(secretsdb, domain,