electrum

commit bd94bb31db6ea163a7f7970a757e08daa05c6868
parent d68f42df95ab2db862fcbd8329981400337f1844
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 16 Jan 2016 15:05:59 +0100

Merge branch 'master' of git://github.com/spesmilo/electrum

Diffstat:
M
lib/network.py
 | 
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/network.py b/lib/network.py
@@ -1,6 +1,7 @@
 import time
 import Queue
 import os
+import errno
 import sys
 import random
 import select
@@ -746,7 +747,12 @@ class Network(util.DaemonThread):
             return
         rin = [i for i in self.interfaces.values()]
         win = [i for i in self.interfaces.values() if i.unsent_requests]
-        rout, wout, xout = select.select(rin, win, [], 0.1)
+        try:
+            rout, wout, xout = select.select(rin, win, [], 0.1)
+        except socket.error as (code, msg):
+            if code == errno.EINTR:
+                return
+            raise
         assert not xout
         for interface in wout:
             interface.send_requests()