Partially revert 1f0298dd1b1a939cb215e7b474178b217f8347f4

[nivanova/samba-autobuild/.git] / source4 / scripting / python / samba / join.py

diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index b695277db3b73858b840f1a64b5b30607c560ee7..10f8ad7e584416edfb6fb22d3076f04553664e68 100644 (file)
--- 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