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/provision/sambadns.py | |
| parent | be292021f47eeaa1364bedb2dc9232b60c404fce (diff) | |
| download | samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.tar.gz samba-1f0298dd1b1a939cb215e7b474178b217f8347f4.tar.bz2 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/provision/sambadns.py')
| -rw-r--r-- | source4/scripting/python/samba/provision/sambadns.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py index db98f13ddd..4805294676 100644 --- a/source4/scripting/python/samba/provision/sambadns.py +++ b/source4/scripting/python/samba/provision/sambadns.py @@ -719,7 +719,7 @@ def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid): "DOMAINSID" : str(domainsid), "DESCRIPTOR" : descr}) setup_add_ldif(dom_ldb, setup_path("provision_basedn_options.ldif"), None) - except: + except Exception: logger.error("Failed to setup database for BIND, AD based DNS cannot be used") raise del partfile[domaindn] @@ -754,7 +754,7 @@ def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid): tdb_copy(logger, os.path.join(private_dir, pfile), os.path.join(dns_dir, pfile)) - except: + except Exception: logger.error("Failed to setup database for BIND, AD based DNS cannot be used") raise |