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

2016-01-16 15:05:59 +01:00 · 2016-01-16 15:05:59 +01:00 · bd94bb31db
parent d68f42df95 371f8d6dc3
commit bd94bb31db
1 changed files with 7 additions and 1 deletions
--- 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()