Merge http://projects.collabora.co.uk/~smcv/git/datastore

Conflicts:

	src/olpc/datastore/dbus_helpers.py

2 files changed, 4 insertions, 2 deletions

diff --git a/bin/datastore b/bin/datastore
index 6ca5e39..52d5bd5 100755
--- a/bin/datastore
+++ b/bin/datastore
@@ -3,7 +3,8 @@ from ore.main import Application
 from olpc.datastore import DataStore
 import os, signal
 
-base_dir = os.path.expanduser("~/.sugar/default")
+profile = os.environ.get('SUGAR_PROFILE', 'default')
+base_dir = os.path.join(os.path.expanduser('~'), '.sugar', profile)
 repo_dir = os.path.join(base_dir, 'datastore')
 db_dir   = "sqlite:///%s/datastore.db"  % repo_dir
 
diff --git a/bin/datastore-service b/bin/datastore-service
index e37487c..93f9167 100755
--- a/bin/datastore-service
+++ b/bin/datastore-service
@@ -7,7 +7,8 @@ from olpc.datastore import DataStore, DS_LOG_CHANNEL
 import logging
 
 # Path handling
-base_dir = os.path.expanduser("~/.sugar/default")
+profile = os.environ.get('SUGAR_PROFILE', 'default')
+base_dir = os.path.join(os.path.expanduser('~'), '.sugar', profile)
 repo_dir = os.path.join(base_dir, 'datastore')
 db_dir   = "sqlite:///%s/datastore.db"  % repo_dir