diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-02-25 15:56:25 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-02-25 17:29:34 +0100 |
| commit | 66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0 (patch) | |
| tree | 13ba3c83f9b34effb7b51412c97cd49bfe02c0ae /source4/scripting/python/samba/join.py | |
| parent | f5d706b0ee8486f94853db8e38538c3a74b2e0bb (diff) | |
| download | samba-66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0.tar.gz samba-66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0.tar.xz samba-66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0.zip | |
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
Diffstat (limited to 'source4/scripting/python/samba/join.py')
| -rw-r--r-- | source4/scripting/python/samba/join.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index b695277db3..10f8ad7e58 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -701,7 +701,7 @@ class dc_join(object): ctx.destination_dsa_guid = destination_dsa_guid print "Committing SAM database" - except Exception: + except: ctx.local_samdb.transaction_cancel() raise else: @@ -877,7 +877,7 @@ class dc_join(object): ctx.join_provision_own_domain() ctx.join_setup_trusts() ctx.join_finalise() - except Exception: + except: print "Join failed - cleaning up" ctx.cleanup_old_join() raise |