diff options
author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-28 01:47:32 (GMT) |
---|---|---|
committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-28 01:47:32 (GMT) |
commit | c7749aeaeafa217c838b65a3848548647aa06e89 (patch) | |
tree | ef62915b71e5b4578f1ea60970276e23689615d4 /commands/common.py | |
parent | 224ef97c568300385392e3ca6bf52048dd8a106d (diff) |
Generalize a bit how the test command is run
We should be able to use the same logic for other services.
Diffstat (limited to 'commands/common.py')
-rw-r--r-- | commands/common.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/commands/common.py b/commands/common.py index a5dd056..b26e192 100644 --- a/commands/common.py +++ b/commands/common.py @@ -13,16 +13,22 @@ from devbot import distro def setup(): config.load_plugins() + relocatable = "SUGAR_BUILDBOT" in os.environ + logs_dir = os.path.join(base_dir, "logs") + install_dir = os.path.join(base_dir, "install") + config.set_devbot_dir(os.path.join(base_dir, "devbot")) config.set_config_dir(os.path.join(base_dir, "config")) - config.set_install_dir(os.path.join(base_dir, "install"), - relocatable="SUGAR_BUILDBOT" in os.environ) + config.set_install_dir(install_dir, relocatable=relocatable) config.set_source_dir(os.path.join(base_dir, "source")) config.set_build_dir(os.path.join(base_dir, "build")) config.set_commands_dir(os.path.join(base_dir, "commands")) - config.set_logs_dir(os.path.join(base_dir, "logs")) config.set_home_dir(os.path.join(base_dir, "home")) config.set_prefs_path(os.path.join(base_dir, "prefs")) + config.set_logs_dir(logs_dir) + + os.environ["SB_LOGS_DIR"] = logs_dir + os.environ["SB_LIBEXEC_DIR"] = config.libexec_dir version = distro.get_distro_info().system_version |