diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-15 22:49:16 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-15 22:49:16 (GMT) |
| commit | c6206d0f80d5961b5d52a5b03765acdad2c22f7e (patch) | |
| tree | e29e37651a76e0858d6a580a1e7e9bd3cf4c770f | |
| parent | 15882010491d9f2de6fb43f1c40d753b386c0e2b (diff) | |
Factor out part of xdg home setup to sugar-runner
This is because sugar-runner should work also outside
sugar-build.
| -rw-r--r-- | devbot/config.py | 17 | ||||
| -rw-r--r-- | devbot/environ.py | 4 | ||||
| -rw-r--r-- | devbot/run.py | 2 |
3 files changed, 3 insertions, 20 deletions
diff --git a/devbot/config.py b/devbot/config.py index 9d11b2b..2f9999c 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -20,9 +20,7 @@ etc_dir = None libexec_dir = None package_files = None system_lib_dirs = None -cache_home_dir = None -config_home_dir = None -data_home_dir = None +home_dir = None build_state_dir = None _source_dir = None @@ -111,21 +109,10 @@ def _setup_state_dir(state_dir): base_home_dir = os.path.join(state_dir, "home") _ensure_dir(base_home_dir) + global home_dir home_dir = os.path.join(base_home_dir, get_pref("PROFILE")) _ensure_dir(home_dir) - global cache_home_dir - cache_home_dir = os.path.join(home_dir, "cache") - _ensure_dir(cache_home_dir) - - global config_home_dir - config_home_dir = os.path.join(home_dir, "config") - _ensure_dir(config_home_dir) - - global data_home_dir - data_home_dir = os.path.join(home_dir, "data") - _ensure_dir(data_home_dir) - def _setup_prefix_dir(dir, relocatable): global prefix_dir diff --git a/devbot/environ.py b/devbot/environ.py index 9948e47..a2a2a5b 100644 --- a/devbot/environ.py +++ b/devbot/environ.py @@ -61,10 +61,6 @@ def _setup_variables(): os.environ["GTK_DATA_PREFIX"] = config.prefix_dir os.environ["GTK_PATH"] = os.path.join(config.lib_dir, "gtk-2.0") - 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" def _setup_gconf(): diff --git a/devbot/run.py b/devbot/run.py index 5d2742a..110fe1a 100644 --- a/devbot/run.py +++ b/devbot/run.py @@ -14,7 +14,7 @@ from devbot import config def run(command): environ.setup() - args = [command] + args = [command, "--home-dir", config.home_dir] resolution = config.get_pref("RESOLUTION") if resolution: |