diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-28 16:44:06 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-28 16:44:06 (GMT) |
| commit | 08c27487173faf6a86b5fe20e6b545033b6d1638 (patch) | |
| tree | 6b412c3c7bd0f7d72ad3c5d20221b740778c63bd /commands | |
| parent | 542477741abe0135c652a78911a0eb9aec9b1a19 (diff) | |
Rework initialization
To avoid duplicatin environ setup calls.
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/common.py | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/commands/common.py b/commands/common.py index a7e16d1..4091545 100644 --- a/commands/common.py +++ b/commands/common.py @@ -5,23 +5,16 @@ base_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) sys.path.append(base_dir) -from devbot import config -from devbot import git +from devbot import main def setup(log_name=None): - args = {"config_dir": os.path.join(base_dir, "config"), - "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": os.path.join(base_dir, "logs")} - - if log_name: - args["log_name"] = log_name - - if "SUGAR_BUILDBOT" in os.environ: - args["relocatable"] = True - - config.setup(**args) + main.setup({"config_dir": os.path.join(base_dir, "config"), + "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": os.path.join(base_dir, "logs"), + "relocatable": "SUGAR_BUILDBOT" in os.environ, + "log_name": log_name}) |