sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

Partially revert 1f0298dd1b

Browse Source 
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
This commit is contained in:
Jelmer Vernooij
2012-02-25 15:56:25 +01:00
parent f5d706b0ee
commit 66f13ea1e9
7 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/join.py
View File

@ -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