Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Garg <ajay@sugarlabs.org>2011-11-08 22:51:13 (GMT)
committer Anish Mangal <anish@activitycentral.com>2012-04-27 10:02:36 (GMT)
commitc3a7e5872ed2b60c6f62ed506568e41d4f04b8f7 (patch)
tree3d6388022c39a0e9ebb623732d7a66eda0c61fa7
parent2f8fbd663a6b41ba607462a0aa48e4bc0a4cd311 (diff)
AU#694: More friendly message when not able to connect to XS
Signed-off-by: Ajay Garg <ajay@sugarlabs.org> Authored-by: Ajay Garg <ajay@sugarlabs.org> Signed-off-by: Anish Mangal <anish@sugarlabs.org>
-rw-r--r--src/jarabe/desktop/schoolserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
index 403897b..b9b8830 100644
--- a/src/jarabe/desktop/schoolserver.py
+++ b/src/jarabe/desktop/schoolserver.py
@@ -140,7 +140,9 @@ def register_laptop(url=_REGISTER_URL):
data = server.register(sn, nick, uuid_, profile.pubkey)
except (xmlrpclib.Error, TypeError, socket.error):
logging.exception('Registration: cannot connect to server')
- raise RegisterError(_('Cannot connect to the server.'))
+ raise RegisterError(_('Please ensure that you are connected ' \
+ 'to the correct network and that the ' \
+ 'server is available.'))
finally:
socket.setdefaulttimeout(None)