[svn] commit: r1232 - /branches/xfrin/src/bin/xfrin/xfrin.py.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Tue Mar  9 13:12:48 2010
New Revision: 1232

Log:
When do xfrin, if module bind10_message hasn't be imported successfully, command "retransfer"  will fail.

Modified:
    branches/xfrin/src/bin/xfrin/xfrin.py.in

Modified: branches/xfrin/src/bin/xfrin/xfrin.py.in
==============================================================================
--- branches/xfrin/src/bin/xfrin/xfrin.py.in (original)
+++ branches/xfrin/src/bin/xfrin/xfrin.py.in Tue Mar  9 13:12:48 2010
@@ -26,7 +26,10 @@
 import socket
 import random
 from isc.config.ccsession import *
-from bind10_message import *
+try:
+    from bind10_message import *
+except:
+    pass
 
 # If B10_FROM_SOURCE is set in the environment, we use data files
 # from a directory relative to that, otherwise we use the ones
@@ -380,6 +383,9 @@
     def xfrin_start(self, zone_name, db_file, master_addr, 
                     port = 53, 
                     check_soa = True):
+        if "bind10_message" not in sys.modules:
+            return (1, "xfrin failed, can't load dns message python library: 'bind10_message'")
+
         # check max_transfer_in, else return quota error
         if self.recorder.count() >= self._max_transfers_in:
             return (1, 'xfrin quota error')