diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-01-24 11:54:54 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2012-01-24 03:32:40 +0100 |
| commit | 1f0298dd1b1a939cb215e7b474178b217f8347f4 (patch) | |
| tree | 6ca7a3908b797f6e35b91c6156fb9d9a5bed4697 /source4/scripting/python/samba/join.py | |
| parent | be292021f47eeaa1364bedb2dc9232b60c404fce (diff) | |
| download | samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.tar.gz samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.tar.xz samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.zip | |
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 <amitay@samba.org>
Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104
Diffstat (limited to 'source4/scripting/python/samba/join.py')
| -rw-r--r-- | source4/scripting/python/samba/join.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |