From cc7ce538c3e7d126cc8a1051d4f38e58761c7eaf Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@marcopg.org>
Date: Wed, 03 Dec 2008 12:23:37 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'bin')

diff --git a/bin/sugar-session b/bin/sugar-session
index 12e1f9e..7118c21 100644
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -77,20 +77,6 @@ def cleanup_logs():
             dest_path = os.path.join(backup_dir, log)
             os.rename(source_path, dest_path)
 
-def start_datastore():
-    from sugar.datastore import datastore
-
-    # Mount the datastore in internal flash
-    ds_path = env.get_profile_path('datastore')
-    try:
-        datastore.mount(ds_path, [], timeout=120)
-    except Exception, e:
-        # Don't explode if there's corruption; move the data out of the way
-        # and attempt to create a store from scratch.
-        logging.error(e)
-        shutil.move(ds_path, os.path.abspath(ds_path) + str(time.time()))
-        datastore.mount(ds_path, [], timeout=120)
-
 def start_ui_service():
     from jarabe.view.service import UIService
 
@@ -146,7 +132,6 @@ def main():
     if timezone is not '':    
         os.environ['TZ'] = timezone
 
-    start_datastore()
     start_ui_service()
     start_session_manager()
 
--
cgit v0.9.1