From 66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 25 Feb 2012 15:56:25 +0100
Subject: Partially revert 1f0298dd1b1a939cb215e7b474178b217f8347f4
It's fine to catch keyboard interrupts and other kinds of errors when it's done just for resource management, where the error is reraised later.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Feb 25 17:29:34 CET 2012 on sn-devel-104
---
source4/scripting/python/samba/provision/common.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'source4/scripting/python/samba/provision/common.py')
diff --git a/source4/scripting/python/samba/provision/common.py b/source4/scripting/python/samba/provision/common.py
index 04bdb0f3c3d..e9bcdf5f09d 100644
--- a/source4/scripting/python/samba/provision/common.py
+++ b/source4/scripting/python/samba/provision/common.py
@@ -77,7 +77,7 @@ def setup_ldb(ldb, ldif_path, subst_vars):
ldb.transaction_start()
try:
setup_add_ldif(ldb, ldif_path, subst_vars)
- except Exception:
+ except:
ldb.transaction_cancel()
raise
else:
--
cgit