Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <unknown@unknown.com>2010-11-01 16:51:11 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-11-01 16:51:11 (GMT)
commit34fc67f962949d314c3d78ce3032e09a65febe2e (patch)
tree3089a73648bbf33a263d30544d201d7be898e691
parentda33877c8990646786e03bb416c0f70af349af8f (diff)
schoolserver.register_laptop() complains when offline
register_laptop() now raises the TypeError raised by xmlrpclib as a RegisterError. This also provides visual feedback to the user, prompting to connect to the network.
-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.'))