From 7ad5cf30633c25a846adb8c995416af8d04d3939 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Wed, 12 Dec 2007 12:15:43 +0100
Subject: [PATCH 1/2] Update test for #5389.

---
 tests/lib/test_mime.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/tests/lib/test_mime.py b/tests/lib/test_mime.py
index 88598fe7..3df0ce6b 100644
--- a/tests/lib/test_mime.py
+++ b/tests/lib/test_mime.py
@@ -20,28 +20,28 @@
 import sys
 import unittest
 
-from sugar import objects
+from sugar import mime
 
 class TestMime(unittest.TestCase):
     def test_from_file_name(self):
-        self.assertEqual(objects.mime.get_from_file_name('test.pdf'),
+        self.assertEqual(mime.get_from_file_name('test.pdf'),
                          'application/pdf')
 
     def test_choose_most_significant(self):
         # Mozilla's text in dnd
-        mime_type = objects.mime.choose_most_significant(
+        mime_type = mime.choose_most_significant(
                 ['text/plain', 'text/_moz_htmlcontext', 'text/unicode',
                  'text/html', 'text/_moz_htmlinfo'])
         self.assertEqual(mime_type, 'text/html')
         
         # Mozilla's text in c&v
-        mime_type = objects.mime.choose_most_significant(
+        mime_type = mime.choose_most_significant(
                 ['text/_moz_htmlcontext', 'STRING', 'text/html', 'text/_moz_htmlinfo',
                  'text/x-moz-url-priv', 'UTF8_STRING', 'COMPOUND_TEXT'])
         self.assertEqual(mime_type, 'text/html')
 
         # Mozilla gif in dnd
-        mime_type = objects.mime.choose_most_significant(
+        mime_type = mime.choose_most_significant(
                 ['application/x-moz-file-promise-url',
                  'application/x-moz-file-promise-dest-filename', 'text/_moz_htmlinfo',
                  'text/x-moz-url-desc', 'text/_moz_htmlcontext', 'text/x-moz-url-data',
@@ -49,24 +49,33 @@ class TestMime(unittest.TestCase):
         self.assertEqual(mime_type, 'text/uri-list')
 
         # Mozilla url in dnd
-        mime_type = objects.mime.choose_most_significant(
+        mime_type = mime.choose_most_significant(
                 ['text/_moz_htmlcontext', 'text/html', 'text/_moz_htmlinfo',
                  '_NETSCAPE_URL', 'text/x-moz-url', 'text/x-moz-url-desc',
                  'text/x-moz-url-data', 'text/plain', 'text/unicode'])
         self.assertEqual(mime_type, 'text/x-moz-url')
 
         # Abiword text in dnd
-        mime_type = objects.mime.choose_most_significant(
+        mime_type = mime.choose_most_significant(
                 ['text/rtf', 'text/uri-list'])
         self.assertEqual(mime_type, 'text/uri-list')
 
         # Abiword text in c&v
-        mime_type = objects.mime.choose_most_significant(
+        mime_type = mime.choose_most_significant(
                 ['UTF8_STRING', 'STRING', 'text/html', 'TEXT', 'text/rtf',
                  'COMPOUND_TEXT', 'application/rtf', 'text/plain',
                  'application/xhtml+xml'])
         self.assertEqual(mime_type, 'application/rtf')
 
+        # Abiword text in c&v
+        mime_type = mime.choose_most_significant(
+                ['GTK_TEXT_BUFFER_CONTENTS',
+                 'application/x-gtk-text-buffer-rich-text',
+                 'UTF8_STRING', 'COMPOUND_TEXT', 'TEXT', 'STRING',
+                 'text/plain;charset=utf-8', 'text/plain;charset=UTF-8',
+                 'text/plain'])
+        self.assertEqual(mime_type, 'text/plain')
+
 if __name__ == "__main__":
     unittest.main()
 

From ebcfbcedc2521c89bf60f0200ef02d70da82861a Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Thu, 13 Dec 2007 13:13:33 +0100
Subject: [PATCH 2/2] In case of error when mounting the DS, move the existing
 data and start a clean one. (neuralis)

---
 shell/view/Shell.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index b9d259f0..72aa3b1c 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -20,6 +20,7 @@ import logging
 import tempfile
 import os
 import time
+import shutil
 
 import gobject
 import gtk
@@ -80,8 +81,16 @@ class Shell(gobject.GObject):
 
     def _start_journal_idle(self):
         # Mount the datastore in internal flash
-        datastore.mount(env.get_profile_path('datastore'), [],
-                        timeout=120 * DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND)
+        ds_path = env.get_profile_path('datastore')
+        try:
+            datastore.mount(ds_path, [], timeout=120 * \
+                                         DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND)
+        except:
+            # Don't explode if there's corruption; move the data out of the way
+            # and attempt to create a store from scratch.
+            shutil.move(ds_path, os.path.abspath(ds_path) + str(time.time()))
+            datastore.mount(ds_path, [], timeout=120 * \
+                                         DBUS_PYTHON_TIMEOUT_UNITS_PER_SECOND)
 
         # Checking for the bundle existence will also ensure
         # that the shell service is started up.