From 5602b12be825b963071a2ebb1c05cf5488357bbc Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 15 Dec 2012 10:06:08 +0000
Subject: Support multiple profiles in home dir

---
(limited to 'devbot')

diff --git a/devbot/config.py b/devbot/config.py
index bb131b8..50012f3 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -111,7 +111,10 @@ def _setup_state_dir(state_dir):
     build_state_dir = os.path.join(state_dir, "build")
     _ensure_dir(build_state_dir)
 
-    home_dir = os.path.join(state_dir, "home")
+    base_home_dir = os.path.join(state_dir, "home")
+    _ensure_dir(base_home_dir)
+
+    home_dir = os.path.join(base_home_dir, get_pref("PROFILE"))
     _ensure_dir(home_dir)
 
     global cache_home_dir
@@ -245,8 +248,10 @@ def get_log_path(prefix):
     return logfile_path
 
 def get_pref(name):
+    defaults = { "PROFILE": "default" }
+
     prefs = _read_prefs()
-    return prefs.get(name, None)
+    return prefs.get(name, defaults.get(name, None))
 
 def set_pref(name, value):
     prefs = _read_prefs()
diff --git a/devbot/environ.py b/devbot/environ.py
index 2afc49f..220b39e 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -65,12 +65,9 @@ def _setup_variables():
     os.environ["XDG_CACHE_HOME"] = config.cache_home_dir
     os.environ["XDG_DATA_HOME"] = config.data_home_dir
     os.environ["XDG_CONFIG_HOME"] = config.config_home_dir
+    os.environ["SUGAR_PROFILE"] = config.get_pref("PROFILE")
     os.environ["CC"] = "ccache gcc"
 
-    profile = config.get_pref("PROFILE")
-    if profile is not None:
-        os.environ["SUGAR_PROFILE"] = profile
-
 def _setup_gconf():
     gconf_dir = os.path.join(config.etc_dir, "gconf")
     gconf_pathdir = os.path.join(gconf_dir, "2")
--
cgit v0.9.1