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/provision/sambadns.py | |
| parent | f5d706b0ee8486f94853db8e38538c3a74b2e0bb (diff) | |
| download | samba-66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0.tar.gz samba-66f13ea1e9ad8d66f6dec7e6a4716bcdb1dfbfa0.tar.bz2 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/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 2aefe4dae0..ae8515689b 100644 --- a/source4/scripting/python/samba/provision/sambadns.py +++ b/source4/scripting/python/samba/provision/sambadns.py @@ -715,7 +715,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 Exception: + except: logger.error("Failed to setup database for BIND, AD based DNS cannot be used") raise del partfile[domaindn] @@ -750,7 +750,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 Exception: + except: logger.error("Failed to setup database for BIND, AD based DNS cannot be used") raise |