diff options
author | Anish Mangal <anish@activitycentral.com> | 2012-02-06 16:35:39 (GMT) |
---|---|---|
committer | Anish Mangal <anish@activitycentral.com> | 2012-02-06 16:35:39 (GMT) |
commit | a23d105ac5a630cb32d04be20d8e1dc9ba729729 (patch) | |
tree | ff2ecce4f9251004fd647d93e24814a5762e75e3 /rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch | |
parent | 81614da76dc65f92e9c51d6ac2c09a8866b6e274 (diff) |
Add raw patchset 20120124 (silbe) for sugar
Diffstat (limited to 'rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch')
-rw-r--r-- | rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch b/rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch new file mode 100644 index 0000000..2ab1112 --- /dev/null +++ b/rpms/sugar/0074-AU-694-More-friendly-message-when-not-able-to-connec.patch @@ -0,0 +1,31 @@ +From a426426480d813fb8832819bdf5740ab8b036e5b Mon Sep 17 00:00:00 2001 +From: Ajay Garg <ajay@sugarlabs.org> +Date: Tue, 8 Nov 2011 22:51:13 +0000 +Subject: [PATCH sugar 74/74] 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> +--- + src/jarabe/desktop/schoolserver.py | 4 +++- + 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) + +-- +1.7.6 + |