From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Tue, 22 Jan 2013 12:35:41 +0000 (+0100)
Subject: [2439] (unrelated) Remove broken try-catch for import
X-Git-Tag: bind10-1.0.0-rc-release~25^2~13^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d69610ffffd701cd3a6fb2645f9ff24b69cb3b7;p=thirdparty%2Fkea.git

[2439] (unrelated) Remove broken try-catch for import

If we can't even import the DNS library, we are doomed and there's no
reason to continue running. So remove the check. We would probably crash
in a very short time anyway due to a call to something from the not
imported library.
---

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 1746b87b21..1ce97b8a86 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -36,6 +36,7 @@ from isc.xfrin.diff import Diff
 from isc.server_common.auth_command import auth_loadzone_command
 from isc.server_common.tsig_keyring import init_keyring, get_keyring
 from isc.log_messages.xfrin_messages import *
+from isc.dns import *
 
 isc.log.init("b10-xfrin", buffer=True)
 logger = isc.log.Logger("xfrin")
@@ -45,13 +46,6 @@ logger = isc.log.Logger("xfrin")
 DBG_PROCESS = logger.DBGLVL_TRACE_BASIC
 DBG_COMMANDS = logger.DBGLVL_TRACE_DETAIL
 
-try:
-    from isc.dns import *
-except ImportError as e:
-    # C++ loadable module may not be installed; even so the xfrin process
-    # must keep running, so we warn about it and move forward.
-    logger.error(XFRIN_IMPORT_DNS, str(e))
-
 isc.util.process.rename()
 
 # If B10_FROM_BUILD is set in the environment, we use data files