BIND 10 master, updated. e03cb3e3bc2bebf0924288afc7c62ab3382ec8d1 [530] Merge branch 'trac530'

[BIND 10 source code commits]

The branch, master has been updated
       via  e03cb3e3bc2bebf0924288afc7c62ab3382ec8d1 (commit)
       via  495195f672876310d4d10a997b0c2ac6c3c23117 (commit)
       via  b756633d52f492b02efce5303432f9ec97646389 (commit)
      from  e144ab7b4fa2cbaa258849b8f2d31746326a43ea (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 e03cb3e3bc2bebf0924288afc7c62ab3382ec8d1
Merge: e144ab7 495195f
Author: Kean Johnston <kean at isc.org>
Date:   Thu Nov 14 10:37:55 2013 +0200

    [530] Merge branch 'trac530'

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

Summary of changes:
 src/bin/bind10/init.py.in            |   10 +++++++---
 src/bin/bind10/tests/init_test.py.in |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/init.py.in b/src/bin/bind10/init.py.in
index cb1847d..67491b3 100755
--- a/src/bin/bind10/init.py.in
+++ b/src/bin/bind10/init.py.in
@@ -490,7 +490,7 @@ class Init:
         self.log_starting("b10-msgq")
         msgq_proc = self._make_process_info("b10-msgq", ["b10-msgq"],
                                             self.c_channel_env,
-                                            True, not self.verbose)
+                                            not self.verbose, not self.verbose)
         msgq_proc.spawn()
         self.log_started(msgq_proc.pid)
 
@@ -741,8 +741,12 @@ class Init:
         try:
             self.cc_session = isc.cc.Session(self.msgq_socket_file)
             logger.fatal(BIND10_MSGQ_ALREADY_RUNNING)
-            return "b10-msgq already running, or socket file not cleaned , " +\
-                "cannot start"
+            if self.msgq_socket_file is not None:
+              socket_name = "socket file '" + self.msg_socket_file + "'"
+            else:
+              socket_name = "default socket file"
+            return "b10-msgq already running, or " + socket_name +\
+                " not cleaned - cannot start"
         except isc.cc.session.SessionError:
             # this is the case we want, where the msgq is not running
             pass
diff --git a/src/bin/bind10/tests/init_test.py.in b/src/bin/bind10/tests/init_test.py.in
index 913e642..af41eb6 100644
--- a/src/bin/bind10/tests/init_test.py.in
+++ b/src/bin/bind10/tests/init_test.py.in
@@ -1651,7 +1651,7 @@ class TestInitComponents(unittest.TestCase):
         pi = init.start_msgq()
         self.assertEqual('b10-msgq', pi.name)
         self.assertEqual(['b10-msgq'], pi.args)
-        self.assertTrue(pi.dev_null_stdout)
+        self.assertEqual(pi.dev_null_stdout, not verbose)
         self.assertEqual(pi.dev_null_stderr, not verbose)
         self.assertEqual({'FOO': 'an env string'}, pi.env)