summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-19 14:11:51 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-19 14:11:51 +1000
commitb33f4541f6157163f9b22af8607ecefe3953638f (patch)
treecb36a27033500dff5790789e696a4d24bf8ec30f /source4/scripting
parent7ef21658fbb519859aa7d23a614e1fdbcae95693 (diff)
parentaef684da3149eaf2b8d87c4903af241c9a2311a6 (diff)
downloadsamba-b33f4541f6157163f9b22af8607ecefe3953638f.tar.gz
samba-b33f4541f6157163f9b22af8607ecefe3953638f.tar.bz2
samba-b33f4541f6157163f9b22af8607ecefe3953638f.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fc6b4f03ebba015a13a6ab93221b0bc3ef8ef2ed)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f48a49dcfa..0855efe3bb 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -623,7 +623,17 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
"""
templates_ldb = SamDB(path, session_info=session_info,
credentials=credentials, lp=lp)
- templates_ldb.erase()
+ # Wipes the database
+ try:
+ templates_ldb.erase()
+ except:
+ os.unlink(path)
+
+ templates_ldb.load_ldif_file_add(setup_path("provision_templates_init.ldif"))
+
+ templates_ldb = SamDB(path, session_info=session_info,
+ credentials=credentials, lp=lp)
+
templates_ldb.load_ldif_file_add(setup_path("provision_templates.ldif"))