BIND 10 trac759, updated. 92e916b4fe00c6a544121616a401d0d5ea125686 [trac759] review comments

[BIND 10 source code commits]

The branch, trac759 has been updated
       via  92e916b4fe00c6a544121616a401d0d5ea125686 (commit)
      from  91bab51181c8ebc89e0ee2e735cc6e851eb6b93d (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 92e916b4fe00c6a544121616a401d0d5ea125686
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Jun 28 11:38:00 2011 +0200

    [trac759] review comments

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

Summary of changes:
 src/bin/cfgmgr/b10-cfgmgr.py.in       |    4 ++--
 src/lib/python/isc/config/Makefile.am |    5 ++++-
 src/lib/python/isc/config/cfgmgr.py   |    4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/b10-cfgmgr.py.in b/src/bin/cfgmgr/b10-cfgmgr.py.in
index 831e5ae..fc314dc 100755
--- a/src/bin/cfgmgr/b10-cfgmgr.py.in
+++ b/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
 
diff --git a/src/lib/python/isc/config/Makefile.am b/src/lib/python/isc/config/Makefile.am
index 093340f..55c1802 100644
--- a/src/lib/python/isc/config/Makefile.am
+++ b/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)
diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py
index 251a60f..150bf8e 100644
--- a/src/lib/python/isc/config/cfgmgr.py
+++ b/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)