summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipaserver/dcerpc.py4
-rwxr-xr-xmake-lint1
2 files changed, 2 insertions, 3 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 32e1ab5a8..b206b7aba 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -714,8 +714,8 @@ class DomainValidator(object):
root_logger.debug(msg)
else:
root_logger.warning(msg)
- finally:
- return entries
+
+ return entries
def __retrieve_trusted_domain_gc_list(self, domain):
"""
diff --git a/make-lint b/make-lint
index 4142821f6..f8cf3214a 100755
--- a/make-lint
+++ b/make-lint
@@ -264,7 +264,6 @@ def main():
linter.set_option('disable', 'global-statement')
linter.set_option('disable', 'global-variable-not-assigned')
linter.set_option('disable', 'global-variable-undefined')
- linter.set_option('disable', 'lost-exception')
linter.set_option('disable', 'no-init')
linter.set_option('disable', 'pointless-except')
linter.set_option('disable', 'pointless-statement')