BIND 10 master, updated. 0a72b7f58d8d2ab06e4290443cf6adb4f4eef540 [master] Update changelog for merge of #2190

[BIND 10 source code commits]

The branch, master has been updated
       via  0a72b7f58d8d2ab06e4290443cf6adb4f4eef540 (commit)
       via  e0ffa11d49ab949ee5a4ffe7682b0e6906667baa (commit)
       via  63e83a8f9c1ab9f7b32b76f80e65a771ee302cee (commit)
       via  7230b23ea3aa18eb74d7f3eb705ef1f9ff0cee01 (commit)
      from  b97e136dad599abde963d6971494d5838e1c6fbd (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 0a72b7f58d8d2ab06e4290443cf6adb4f4eef540
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Sep 24 09:47:20 2012 +0200

    [master] Update changelog for merge of #2190

commit e0ffa11d49ab949ee5a4ffe7682b0e6906667baa
Merge: b97e136 63e83a8
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Sep 24 09:44:14 2012 +0200

    [master] Merge remote-tracking branch 'origin/trac2190'

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

Summary of changes:
 ChangeLog                         |    5 +++++
 src/bin/msgq/msgq.py.in           |    4 ++--
 src/bin/stats/tests/test_utils.py |   13 ++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 71ba136..4125403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+477.	[bug]		jelte
+	Fixed a problem with b10-msgq on OSX when using a custom Python
+	installation, that offers an unreliable select.poll() interface.
+	(Trac #2190, git e0ffa11d49ab949ee5a4ffe7682b0e6906667baa)
+
 476.	[bug]		vorner
 	The XfrIn now accepts transfers with some TSIG signatures omitted, as
 	allowed per RFC2845, section 4.4. This solves a compatibility issues with
diff --git a/src/bin/msgq/msgq.py.in b/src/bin/msgq/msgq.py.in
index 58b1d87..010a1a5 100755
--- a/src/bin/msgq/msgq.py.in
+++ b/src/bin/msgq/msgq.py.in
@@ -131,9 +131,9 @@ class MsgQ:
     def setup_poller(self):
         """Set up the poll thing.  Internal function."""
         try:
-            self.poller = select.poll()
-        except AttributeError:
             self.kqueue = select.kqueue()
+        except AttributeError:
+            self.poller = select.poll()
 
     def add_kqueue_socket(self, socket, write_filter=False):
         """Add a kquque filter for a socket.  By default the read
diff --git a/src/bin/stats/tests/test_utils.py b/src/bin/stats/tests/test_utils.py
index f8abb57..55b08cb 100644
--- a/src/bin/stats/tests/test_utils.py
+++ b/src/bin/stats/tests/test_utils.py
@@ -107,19 +107,10 @@ class MockMsgq:
 
     def run(self):
         self._started.set()
-        try:
-            self.msgq.run()
-        except Exception:
-            pass
-        finally:
-            # explicitly shut down the socket of the msgq before
-            # shutting down the msgq
-            self.msgq.listen_socket.shutdown(msgq.socket.SHUT_RDWR)
-            self.msgq.shutdown()
+        self.msgq.run()
 
     def shutdown(self):
-        # do nothing
-        pass
+        self.msgq.shutdown()
 
 class MockCfgmgr:
     def __init__(self):