[svn] commit: r1279 - in /trunk/src: bin/cfgmgr/b10-cfgmgr.py.in lib/python/isc/config/cfgmgr.py

[BIND 10 source code commits]

Author: jelte
Date: Wed Mar 10 14:52:55 2010
New Revision: 1279

Log:
fixed a potential KeyError exception, and an import in the .py.in

Modified:
    trunk/src/bin/cfgmgr/b10-cfgmgr.py.in
    trunk/src/lib/python/isc/config/cfgmgr.py

Modified: trunk/src/bin/cfgmgr/b10-cfgmgr.py.in
==============================================================================
--- trunk/src/bin/cfgmgr/b10-cfgmgr.py.in (original)
+++ trunk/src/bin/cfgmgr/b10-cfgmgr.py.in Wed Mar 10 14:52:55 2010
@@ -3,6 +3,7 @@
 import sys; sys.path.append ('@@PYTHONPATH@@')
 
 from isc.config.cfgmgr import ConfigManager
+from isc.cc import SessionError
 import signal
 import os
 
@@ -30,7 +31,7 @@
         cm.read_config()
         cm.notify_boss()
         cm.run()
-    except isc.cc.SessionError as se:
+    except SessionError as se:
         print("[b10-cfgmgr] Error creating config manager, "
               "is the command channel daemon running?")
     except KeyboardInterrupt as kie:

Modified: trunk/src/lib/python/isc/config/cfgmgr.py
==============================================================================
--- trunk/src/lib/python/isc/config/cfgmgr.py (original)
+++ trunk/src/lib/python/isc/config/cfgmgr.py Wed Mar 10 14:52:55 2010
@@ -267,7 +267,7 @@
             got_error = False
             err_list = []
             for module in self.config.data:
-                if module != "version" and self.config.data[module] != old_data[module]:
+                if module != "version" and (module not in old_data or self.config.data[module] != old_data[module]):
                     update_cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, self.config.data[module])
                     print("[XX] send update: " + str(update_cmd))
                     print("[XX] to: " + str(module))