BIND 10 trac2439, updated. 0d69610ffffd701cd3a6fb2645f9ff24b69cb3b7 [2439] (unrelated) Remove broken try-catch for import

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Jan 22 12:36:55 UTC 2013


The branch, trac2439 has been updated
       via  0d69610ffffd701cd3a6fb2645f9ff24b69cb3b7 (commit)
      from  e382b73b40ea40386202d1c91dfe57c8a4efc11f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d69610ffffd701cd3a6fb2645f9ff24b69cb3b7
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jan 22 13:35:41 2013 +0100

    [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.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.py.in |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 1746b87..1ce97b8 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



More information about the bind10-changes mailing list