Browse Source

[trac759] review comments

Jelte Jansen 14 years ago
parent
commit
92e916b4fe

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

@@ -94,12 +94,12 @@ def main():
         cm.notify_boss()
         cm.run()
     except SessionError as se:
-        logger.error(CFGMGR_CC_SESSION_ERROR, str(se))
+        logger.fatal(CFGMGR_CC_SESSION_ERROR, se)
         return 1
     except KeyboardInterrupt as kie:
         logger.info(CFGMGR_STOPPED_BY_KEYBOARD)
     except ConfigManagerDataReadError as cmdre:
-        logger.error(CFGMGR_DATA_READ_ERROR, str(cmdre))
+        logger.fatal(CFGMGR_DATA_READ_ERROR, cmdre)
         return 2
     return 0
 

+ 4 - 1
src/lib/python/isc/config/Makefile.am

@@ -1,7 +1,6 @@
 SUBDIRS = . tests
 
 python_PYTHON = __init__.py ccsession.py cfgmgr.py config_data.py module_spec.py cfgmgr_messages.py
-python_SCRIPTS = cfgmgr_messages.py
 
 pythondir = $(pyexecdir)/isc/config
 
@@ -13,5 +12,9 @@ CLEANFILES = cfgmgr_messages.py cfgmgr_messages.pyc
 
 CLEANDIRS = __pycache__
 
+EXTRA_DIST = cfgmgr_messages.mes
+
+all-local: cfgmgr_messages.py
+
 clean-local:
 	rm -rf $(CLEANDIRS)

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

@@ -137,9 +137,9 @@ class ConfigManagerData:
             else:
                 os.rename(filename, self.db_filename)
         except IOError as ioe:
-            logger.error(CFGMGR_IOERROR_WHILE_WRITING_CONFIGURATION, str(ioe))
+            logger.error(CFGMGR_IOERROR_WHILE_WRITING_CONFIGURATION, ioe)
         except OSError as ose:
-            logger.error(CFGMGR_OSERROR_WHILE_WRITING_CONFIGURATION, str(ose))
+            logger.error(CFGMGR_OSERROR_WHILE_WRITING_CONFIGURATION, ose)
         try:
             if filename and os.path.exists(filename):
                 os.remove(filename)