Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorDan Williams <dcbw@localhost.localdomain>2006-09-21 21:02:20 (GMT)
committer Dan Williams <dcbw@localhost.localdomain>2006-09-21 21:02:20 (GMT)
commit4410ad50562154aa3894432ec10f0b1452402b03 (patch)
tree056dec68e505fdcd0067345b2837c2bbbdf1a179 /sugar
parent3c11feca6f74d8bd6e45fefcac9d7e1ef5a9e02f (diff)
Don't traceback on reset-by-peer errors
Diffstat (limited to 'sugar')
-rw-r--r--sugar/p2p/network.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/sugar/p2p/network.py b/sugar/p2p/network.py
index ac257bc..76ea372 100644
--- a/sugar/p2p/network.py
+++ b/sugar/p2p/network.py
@@ -179,7 +179,15 @@ class GlibXMLRPCTransport(xmlrpclib.Transport):
if not (condition & gobject.IO_IN):
return True
- errcode, errmsg, headers = h.getreply()
+ try:
+ errcode, errmsg, headers = h.getreply()
+ except socket.error, err:
+ if err[0] != 104:
+ raise socket.error(err)
+ else:
+ gobject.idle_add(request_cb, RESULT_FAILED, None, user_data)
+ return False
+
if errcode != 200:
raise xmlrpclib.ProtocolError(host + handler, errcode, errmsg, headers)
self.verbose = verbose