Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim McNamara <paperless@timmcnamara.co.nz>2010-07-14 12:53:11 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-07-14 12:53:11 (GMT)
commit0bb467b6e1eeb61248aa0447bc3eaf0227f0750f (patch)
tree2f5860ef9df64e118d6b3b926ab9b87733ead0cb
parent8aa387d925847fb891c69efd5ac532e8c55c8d68 (diff)
Catch network errors when trying to register to the school server #2062
-rw-r--r--src/jarabe/desktop/schoolserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
index fc9ddeb..a05f56c 100644
--- a/src/jarabe/desktop/schoolserver.py
+++ b/src/jarabe/desktop/schoolserver.py
@@ -99,7 +99,7 @@ def register_laptop(url=REGISTER_URL):
server = ServerProxy(url)
try:
data = server.register(sn, nick, uuid_, profile.pubkey)
- except (Error, socket.error):
+ except (Error, TypeError, socket.error):
logging.exception('Registration: cannot connect to server')
raise RegisterError(_('Cannot connect to the server.'))