Sugar: Hack for copying bundle to usb bug

 - Hack for copying bundle to usb bug
 - Bump sugar release to v60

2 files changed, 66 insertions, 1 deletions

diff --git a/rpms/sugar/sugar-Copy-.xo-to-removable-device-hack.patch b/rpms/sugar/sugar-Copy-.xo-to-removable-device-hack.patch
new file mode 100644
index 0000000..3bd7e34
--- /dev/null
+++ b/rpms/sugar/sugar-Copy-.xo-to-removable-device-hack.patch
@@ -0,0 +1,56 @@
+From patchwork Wed Mar 16 12:55:53 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar] Copy .xo to removable device hack
+Date: Wed, 16 Mar 2011 17:55:53 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 721
+Message-Id: <1300280153-7190-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org, anish@sugarlabs.org, alsroot@sugarlabs.org
+
+Plan Ceibal folks reported that it wasn't possible
+to copy .xo files from datastore to removable
+devices. This bug affects all versions of dextrose
+and other distros based on sugar 0.88.1.
+
+The problem was caused by a too generalist logic
+at _check_for_bundle in which the journal was trying
+to install bundles also when copying files to
+removable devices.
+
+This bug seems to be fixed in mainstream, but as side
+effect of a big change to the journal code.
+
+This patch checks for corner cases and avoid any attempt of
+installation when copying .xo files to removable devices.
+
+Version 2: Add alsroot suggestions.
+
+Signed-off-by: Martin Abente <martin.abente.lahaye@gmail.com>
+
+---
+src/jarabe/journal/journalactivity.py |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
+index b96135c..916db7c 100644
+--- a/src/jarabe/journal/journalactivity.py
++++ b/src/jarabe/journal/journalactivity.py
+@@ -277,9 +277,15 @@ class JournalActivity(JournalWindow):
+         self._list_view.update_dates()
+ 
+     def _check_for_bundle(self, object_id):
++        # XXX temporary hack, avoid bundle installation
++        # when copying .xo files to removable devices.
++        metadata = model.get(object_id)
++
++        if not model.is_editable(metadata):
++            return
++
+         registry = bundleregistry.get_registry()
+ 
+-        metadata = model.get(object_id)
+         if metadata.get('progress', '').isdigit():
+             if int(metadata['progress']) < 100:
+                 return
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 4d68e15..efa977c 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.59dxo%{?dist}
+Release: 5.60dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -189,6 +189,8 @@ patch3301: sugar-Do-not-fail-in-NM-less-environment.patch
 #Cursor theme fix
 patch3401: sugar-check-for-empty-cursor_theme.patch
 
+patch3601: sugar-Copy-.xo-to-removable-device-hack.patch
+
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -402,6 +404,10 @@ multiple instances of sugar.
 
 %patch3301 -p1
 
+%patch3401 -p1
+
+%patch3601 -p1
+
 %build
 autoreconf
 %configure
@@ -478,6 +484,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Thu Mar 17 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.60
+- XXX Copy bundle to removable device (hack by tch)
+
 * Mon Mar 14 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.59
 - Update check cursor theme patch