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 | |
| 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')
5 files changed, 6 insertions, 6 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: diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/source4/scripting/python/samba/netcmd/dbcheck.py index bd250eb6be..875b059506 100644 --- a/source4/scripting/python/samba/netcmd/dbcheck.py +++ b/source4/scripting/python/samba/netcmd/dbcheck.py @@ -112,7 +112,7 @@ class cmd_dbcheck(Command): else: error_count = chk.check_database(DN=DN, scope=search_scope, controls=controls, attrs=attrs) - except: + except Exception: if started_transaction: samdb.transaction_cancel() raise diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 6c2ebfa301..1e26850277 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -855,7 +855,7 @@ class cmd_domain_samba3upgrade(Command): samba.ntacls.setntacl(lp, tmpfile.name, "O:S-1-5-32G:S-1-5-32", "S-1-5-32", "native") eadb = False - except: + except Exception: # FIXME: Don't catch all exceptions here logger.info("You are not root or your system do not support xattr, using tdb backend for attributes. " "If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.") 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 diff --git a/source4/scripting/python/samba/tests/dcerpc/testrpc.py b/source4/scripting/python/samba/tests/dcerpc/testrpc.py index 44fed72fff..9c2541934f 100644 --- a/source4/scripting/python/samba/tests/dcerpc/testrpc.py +++ b/source4/scripting/python/samba/tests/dcerpc/testrpc.py @@ -61,7 +61,7 @@ class RpcTests(object): print "ERROR: Failed to instantiate %s.%s" % (typename, n) self.errcount += 1 continue - except: + except Exception: print "ERROR: Failed to instantiate %s.%s" % (typename, n) self.errcount += 1 continue |