Sugar: microformat and feedback feature fixes

* Bump version to 53
* Microformat updater, better exception handling
* Feedback feature fixes

4 files changed, 194 insertions, 1 deletions

diff --git a/rpms/sugar/microformat-fix-exception-handler.patch b/rpms/sugar/microformat-fix-exception-handler.patch
new file mode 100644
index 0000000..313303d
--- /dev/null
+++ b/rpms/sugar/microformat-fix-exception-handler.patch
@@ -0,0 +1,61 @@
+From patchwork Fri Feb 11 03:17:21 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: (no subject)
+Date: Fri, 11 Feb 2011 08:17:21 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 638
+Message-Id: <1297394241-21538-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org,
+	anish@sugarlabs.org
+
+>From 4fe8aae4307c9e153a3bb2a25214dfca0bb75676 Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+Date: Thu, 10 Feb 2011 22:22:21 -0300
+Subject: [PATCH] Micro-format fix exception handler
+
+The updater was blocking indefinitely due
+to a unhandled exception and a missing method.
+
+This patch mimics what aslo backend does in order
+to maintain the same behaviour, when the updater
+fails while fetching updates information.
+
+NOTE TO AC: this patch does not solve the hostname
+resolution problem.
+
+Signed-off-by: Martin Abente <martin.abente.lahaye@gmail.com>
+Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
+
+---
+.../cpsection/updater/backends/microformat.py      |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/cpsection/updater/backends/microformat.py b/extensions/cpsection/updater/backends/microformat.py
+index 6abc185..c3c7268 100644
+--- a/extensions/cpsection/updater/backends/microformat.py
++++ b/extensions/cpsection/updater/backends/microformat.py
+@@ -24,6 +24,7 @@ import re
+ import gio
+ import gobject
+ import gconf
++import traceback
+ 
+ from jarabe import config
+ 
+@@ -181,11 +182,10 @@ class _UpdateFetcher(gobject.GObject):
+     def __read_async_cb(self, gfile, result):
+         try:
+             stream = gfile.read_finish(result)
+-        except gio.Error, e:
+-            self.stop()
+-            logging.exception('Error while fetching content from %s' %
+-                    self._url)
++        except:
++            self._completion_cb({}, traceback.format_exc())
+             return
++
+         stream.read_async(4096, self.__stream_read_cb)
+ 
+     def __stream_read_cb(self, stream, result):
diff --git a/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch b/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
new file mode 100644
index 0000000..78c6297
--- /dev/null
+++ b/rpms/sugar/sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
@@ -0,0 +1,70 @@
+From patchwork Sat Feb 12 02:17:17 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] Do not send empty feedback reports if anonymous_with_sn is
+	enabled
+Date: Sat, 12 Feb 2011 07:17:17 -0000
+From: Aleksey Lim <alsroot@activitycentral.org>
+X-Patchwork-Id: 648
+Message-Id: <1297477038-17296-1-git-send-email-alsroot@activitycentral.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ src/jarabe/model/feedback_collector.py |   24 +++++++++++++-----------
+ 1 files changed, 13 insertions(+), 11 deletions(-)
+
+
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+index 43540a0..3f3b9a8 100644
+--- a/src/jarabe/model/feedback_collector.py
++++ b/src/jarabe/model/feedback_collector.py
+@@ -49,7 +49,8 @@ def start(host, port, auto_submit_delay):
+     _port = port
+ 
+     if auto_submit_delay > 0:
+-        gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit, True)
++        logging.debug('Feedback auto submit with %ss delay', auto_submit_delay)
++        gobject.timeout_add_seconds(auto_submit_delay, _auto_submit_cb)
+ 
+ 
+ def update(bundle_id, report, log_file):
+@@ -88,27 +89,28 @@ def submit(message):
+             'nick': nick,
+             'jabber_server': jabber,
+             }
+-    _submit(data, False)
++    _reports.update(data)
++    _submit(False)
+ 
+ 
+ def anonymous_submit(implicit=False):
++    if is_empty():
++        return
++
+     from jarabe.journal import misc
+ 
+-    data = {}
+     client = gconf.client_get_default()
+     if client.get_bool('/desktop/sugar/feedback/anonymous_with_sn'):
+-        data['serial_number'] = misc.get_xo_serial()
+-    _submit(data, implicit)
++        _reports['serial_number'] = misc.get_xo_serial()
++    _submit(implicit)
+ 
+-    return True
+ 
++def _auto_submit_cb():
++    anonymous_submit()
++    return True
+ 
+-def _submit(data, implicit):
+-    if data:
+-        _reports.update(data)
+-    if is_empty():
+-        return
+ 
++def _submit(implicit):
+     logging.debug('Sending feedback report: %r', _reports)
+ 
+     report = simplejson.dumps(_reports)
diff --git a/rpms/sugar/sugar-Switch-default-feedback-serve-to-feedback.sl.o-clean-up-gconf-doc-strings.patch b/rpms/sugar/sugar-Switch-default-feedback-serve-to-feedback.sl.o-clean-up-gconf-doc-strings.patch
new file mode 100644
index 0000000..ecd4aba
--- /dev/null
+++ b/rpms/sugar/sugar-Switch-default-feedback-serve-to-feedback.sl.o-clean-up-gconf-doc-strings.patch
@@ -0,0 +1,48 @@
+From patchwork Sat Feb 12 01:56:55 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] Switch default feedback serve to feedback.sl.o;
+	clean up gconf doc strings
+Date: Sat, 12 Feb 2011 06:56:55 -0000
+From: Aleksey Lim <alsroot@activitycentral.org>
+X-Patchwork-Id: 647
+Message-Id: <1297475815-1356-1-git-send-email-alsroot@activitycentral.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ data/sugar.schemas.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index c33a221..841bc7f 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -9,7 +9,7 @@
+       <default>true</default>
+       <locale name="C">
+         <short>Enable personalized submit</short>
+-        <long>Show device icon to let pople submit text message with all collected data including detialed information about sumbitter.</long>
++        <long>Show device icon to let poeple submit text messages with all collected data including detialed information about sumbitter.</long>
+       </locale>
+     </schema>
+     <schema>
+@@ -31,7 +31,7 @@
+       <default>false</default>
+       <locale name="C">
+         <short>Add XO serial numbers to anonymous submits</short>
+-        <long>Add XO serial numbers to anonymous submits.</long>
++        <long>Actually, setting this value to true will make anonymous sebmits not anonymous for XO laptops. Might be useful for Sugar deployments.</long>
+       </locale>
+     </schema>
+     <schema>
+@@ -39,7 +39,7 @@
+       <applyto>/desktop/sugar/feedback/server_host</applyto>
+       <owner>sugar</owner>
+       <type>string</type>
+-      <default>jita.sugarlabs.org</default>
++      <default>feedback.sugarlabs.org</default>
+       <locale name="C">
+         <short>Server host to send reports to</short>
+         <long>Server that will handle reports sent via HTTPS POST requests.</long>
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 5082e94..637f8d3 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.88.1
-Release: 5.52dxo%{?dist}
+Release: 5.53dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -168,6 +168,11 @@ patch2801: sugar-More-robust-completed-activity-downloads.patch
 
 #feedback feature fixes
 patch2901: sugar-Notify-on-not-sent-feedbacks-fix-issue-with-not-auto-resend.patch
+patch3001: sugar-Switch-default-feedback-serve-to-feedback.sl.o-clean-up-gconf-doc-strings.patch
+patch3002: sugar-Do-not-send-empty-feedback-reports-if-anonymous_with_sn-is-enabled.patch
+
+#microformat updater exception handler fix
+patch3101: microformat-fix-exception-handler.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -370,6 +375,11 @@ multiple instances of sugar.
 
 %patch2901 -p1
 
+%patch3001 -p1
+%patch3002 -p1
+
+%patch3101 -p1
+
 %build
 autoreconf
 %configure
@@ -446,6 +456,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Sat Feb 12 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.53
+- Feeback fixes (change server url, send report with s/n enabled)
+- Microformat updater exception catching fix
+
 * Tue Feb 10 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.52
 - More robust completed activity downloads
 - Notify if feedback is not sent