[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-956-g48ba640

[Andrew Bartlett]

The branch, master has been updated
       via  48ba64010046bece3b54009131f88c851ec82047 (commit)
       via  6b8b7665bdbf47e70e0d6d904c1234c03321182d (commit)
      from  bb7e6f0f51a91e461c18efd392af3e4fc6174c34 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 48ba64010046bece3b54009131f88c851ec82047
Merge: 6b8b7665bdbf47e70e0d6d904c1234c03321182d bb7e6f0f51a91e461c18efd392af3e4fc6174c34
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Feb 18 17:47:43 2009 +1100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel

commit 6b8b7665bdbf47e70e0d6d904c1234c03321182d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Feb 18 17:44:07 2009 +1100

    paper over failure to reprovision with os.unlink()
    
    We need to figure out why the deletes on the database fail, but for
    now doing an unlink of templates_tdb isn't too bad.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/provision.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 10daf1b..a5b3e83 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -647,7 +647,8 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
     # Wipes the database
     try:
         templates_ldb.erase()
-    except LdbError:
+    # This should be 'except LdbError', but on a re-provision the assert in ldb.erase fires, and we need to catch that too
+    except:
         os.unlink(path)
 
     templates_ldb.load_ldif_file_add(setup_path("provision_templates_init.ldif"))


-- 
Samba Shared Repository