From 1f0298dd1b1a939cb215e7b474178b217f8347f4 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Tue, 24 Jan 2012 11:54:54 +1100 Subject: python: Change except: statement to except Exception: This way we only catch true exceptions and keyboard interrupts are not caught here. Autobuild-User: Amitay Isaacs Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104 --- source4/scripting/python/samba/join.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/python/samba/join.py') diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index 818e0cec6d..dc2ceef339 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -683,7 +683,7 @@ class dc_join(object): ctx.destination_dsa_guid = destination_dsa_guid print "Committing SAM database" - except: + except Exception: ctx.local_samdb.transaction_cancel() raise else: -- cgit