From bf0fa30f3ae0b22eba401c0e5f8e675704d55502 Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Mon, 26 Nov 2012 16:20:27 +0000 Subject: Add devbot to python path So that we can generate documentation in sugar-docs. --- diff --git a/commands/common.py b/commands/common.py index 82f3869..a5dd056 100644 --- a/commands/common.py +++ b/commands/common.py @@ -13,6 +13,7 @@ from devbot import distro def setup(): config.load_plugins() + 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) diff --git a/devbot/config.py b/devbot/config.py index 798830a..0170196 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -8,6 +8,7 @@ from devbot import distro from devbot import utils from devbot import plugins +devbot_dir = None config_dir = None logs_dir = None commands_dir = None @@ -59,6 +60,10 @@ def get_commit_id(): return commit_id +def set_devbot_dir(dir): + global devbot_dir + devbot_dir = dir + def set_config_dir(dir): global config_dir config_dir = dir diff --git a/devbot/environ.py b/devbot/environ.py index ccdfd3f..f35779f 100644 --- a/devbot/environ.py +++ b/devbot/environ.py @@ -43,6 +43,9 @@ def _setup_variables(): _add_path("PYTHONPATH", sysconfig.get_python_lib(prefix=config.prefix_dir, plat_specific=True)) + _add_path("PYTHONPATH", + os.path.dirname(config.devbot_dir)) + _add_path("XDG_DATA_DIRS", "/usr/share") _add_path("XDG_DATA_DIRS", config.share_dir) -- cgit v0.9.1