Parcourir la source

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

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1279 e5f2f494-b856-4b98-b285-d166d9295462
Jelte Jansen il y a 15 ans
Parent
commit
c7fef0ff01
2 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 2 1
      src/bin/cfgmgr/b10-cfgmgr.py.in
  2. 1 1
      src/lib/python/isc/config/cfgmgr.py

+ 2 - 1
src/bin/cfgmgr/b10-cfgmgr.py.in

@@ -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 @@ if __name__ == "__main__":
         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:

+ 1 - 1
src/lib/python/isc/config/cfgmgr.py

@@ -267,7 +267,7 @@ class ConfigManager:
             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))