From c26bdad106685cb56186e4c31482479d39917180 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Sat, 15 Dec 2012 20:22:01 +0000 Subject: Minor refactorings --- (limited to 'commands/common.py') diff --git a/commands/common.py b/commands/common.py index 6b961bd..542a1f6 100644 --- a/commands/common.py +++ b/commands/common.py @@ -9,19 +9,14 @@ from devbot import config from devbot import command def setup(): - relocatable = "SUGAR_BUILDBOT" in os.environ - logs_dir = os.path.join(base_dir, "logs") - install_dir = os.path.join(base_dir, "install") - tools_dir = os.path.join(base_dir, "tools") - config.setup(config_dir=os.path.join(base_dir, "config"), - install_dir=install_dir, + install_dir=os.path.join(base_dir, "install"), source_dir=os.path.join(base_dir, "source"), build_dir=os.path.join(base_dir, "build"), state_dir=os.path.join(base_dir, "state"), prefs_path=os.path.join(base_dir, "prefs"), - logs_dir=logs_dir, - relocatable=relocatable) + logs_dir=os.path.join(base_dir, "logs"), + relocatable="SUGAR_BUILDBOT" in os.environ) dep_files = ["system", "sugar-build", @@ -38,4 +33,5 @@ def setup(): config.set_package_files(package_files) + tools_dir = os.path.join(base_dir, "tools") command.set_logger(os.path.join(tools_dir, "log-command")) -- cgit v0.9.1