BIND 10 master, updated. 7c390c1149baab7bd33e741afcdefb827275d5cd Merge branch 'master' into trac848

[BIND 10 source code commits]

The branch, master has been updated
       via  7c390c1149baab7bd33e741afcdefb827275d5cd (commit)
       via  dc19181b46dec42bc5db83861731656a5b45b899 (commit)
      from  d1b5154a7c17058ff49aa67f389f52496228e4b6 (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 7c390c1149baab7bd33e741afcdefb827275d5cd
Merge: dc19181b46dec42bc5db83861731656a5b45b899 d1b5154a7c17058ff49aa67f389f52496228e4b6
Author: Shane Kerr <shane at isc.org>
Date:   Mon May 16 18:39:29 2011 +0200

    Merge branch 'master' into trac848

commit dc19181b46dec42bc5db83861731656a5b45b899
Author: Shane Kerr <shane at isc.org>
Date:   Fri May 13 14:17:48 2011 +0200

    Fix error condition using incorrect errno reference.
    See Trac ticket #848 for more details.
    http://bind10.isc.org/ticket/848

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

Summary of changes:
 src/lib/python/isc/notify/notify_out.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/notify/notify_out.py b/src/lib/python/isc/notify/notify_out.py
index 43dc7af..8f8cf43 100644
--- a/src/lib/python/isc/notify/notify_out.py
+++ b/src/lib/python/isc/notify/notify_out.py
@@ -300,7 +300,7 @@ class NotifyOut:
         try:
             r_fds, w, e = select.select(valid_socks, [], [], block_timeout)
         except select.error as err:
-            if err.args[0] != EINTR:
+            if err.args[0] != errno.EINTR:
                 return {}, {}
 
         if self._read_sock in r_fds: # user has called shutdown()