BIND 10 trac1443, updated. 04e0ef7fe56b4c9c65b71bba010147af4506675d [1443] Addressed review comments

[BIND 10 source code commits]

The branch, trac1443 has been updated
       via  04e0ef7fe56b4c9c65b71bba010147af4506675d (commit)
      from  24b2851dc08da2e9d63a072c1c8b4550ef919996 (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 04e0ef7fe56b4c9c65b71bba010147af4506675d
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Mar 22 15:36:43 2012 +0100

    [1443] Addressed review comments
    
    - if self.clear_config is None was wrong, should just be if self.clear_config
    - 'back up' should have been 'create backup of'
    - default value for unused parameter rename_config_file in b10-cfgmgr_test.py.in MyConfigManager should have been False, not None
    - reordered message file

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

Summary of changes:
 src/bin/bind10/bind10_src.py.in               |    5 +++--
 src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in    |    2 +-
 src/lib/python/isc/config/cfgmgr_messages.mes |    8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 5a3f792..ddc6b7d 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -466,7 +466,7 @@ class BoB:
             args.append("--data-path=" + self.data_path)
         if self.config_filename is not None:
             args.append("--config-filename=" + self.config_filename)
-        if self.clear_config is not None:
+        if self.clear_config:
             args.append("--clear-config")
         bind_cfgd = ProcessInfo("b10-cfgmgr", args,
                                 self.c_channel_env)
@@ -1058,7 +1058,8 @@ def parse_args(args=sys.argv[1:], Parser=OptionParser):
                       help="Configuration database filename")
     parser.add_option("--clear-config", action="store_true",
                       dest="clear_config", default=False,
-                      help="Back up the configuration file and start with a clean one")
+                      help="Create backup of the configuration file and " +
+                           "start with a clean configuration")
     parser.add_option("-p", "--data-path", dest="data_path",
                       help="Directory to search for configuration files",
                       default=None)
diff --git a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
index 141bf6e..ca91c9c 100644
--- a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
+++ b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
@@ -24,7 +24,7 @@ import bind10_config
 from isc.testutils.parse_args import OptsError, TestOptParser
 
 class MyConfigManager:
-    def __init__(self, path, filename, session=None, rename_config_file=None):
+    def __init__(self, path, filename, session=None, rename_config_file=False):
         self._path = path
         self.read_config_called = False
         self.notify_boss_called = False
diff --git a/src/lib/python/isc/config/cfgmgr_messages.mes b/src/lib/python/isc/config/cfgmgr_messages.mes
index b307604..ad78be0 100644
--- a/src/lib/python/isc/config/cfgmgr_messages.mes
+++ b/src/lib/python/isc/config/cfgmgr_messages.mes
@@ -51,11 +51,11 @@ error is given. The most likely cause is that the system does not have
 write access to the configuration database file. The updated
 configuration is not stored.
 
-% CFGMGR_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
-There was a keyboard interrupt signal to stop the cfgmgr daemon. The
-daemon will now shut down.
-
 % CFGMGR_RENAMED_CONFIG_FILE renamed configuration file %1 to %2, will create new %1
 BIND 10 has been started with the command to clear the configuration file.
 The existing file is backed up to the given file name, so that data is not
 immediately lost if this was done by accident.
+
+% CFGMGR_STOPPED_BY_KEYBOARD keyboard interrupt, shutting down
+There was a keyboard interrupt signal to stop the cfgmgr daemon. The
+daemon will now shut down.