From 699023b7d001f8262246c32f8d9676f97b321602 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 15 Dec 2012 19:14:31 +0000
Subject: No point in passing devbot dir to devbot

---
diff --git a/.gitignore b/.gitignore
index 563f199..4548724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ install/
 build/
 source/
 logs/
+home/
 prefs
diff --git a/commands/common.py b/commands/common.py
index 7ada2fe..a5209c2 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -15,8 +15,7 @@ def setup():
     install_dir = os.path.join(base_dir, "install")
     tools_dir = os.path.join(base_dir, "tools")
 
-    config.setup(devbot_dir=os.path.join(base_dir, "devbot"),
-                 config_dir=os.path.join(base_dir, "config"),
+    config.setup(config_dir=os.path.join(base_dir, "config"),
                  install_dir=install_dir,
                  source_dir=os.path.join(base_dir, "source"),
                  build_dir=os.path.join(base_dir, "build"),
diff --git a/devbot/config.py b/devbot/config.py
index 50012f3..fdf4c4b 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -9,7 +9,6 @@ from devbot import utils
 from devbot import plugins
 from devbot import git
 
-devbot_dir = None
 config_dir = None
 logs_dir = None
 commands_dir = None
@@ -79,9 +78,6 @@ def get_commit_id():
 def setup(**kwargs):
     _load_plugins()
 
-    global devbot_dir
-    devbot_dir = kwargs["devbot_dir"]
-
     global config_dir
     config_dir = kwargs["config_dir"]
 
diff --git a/devbot/environ.py b/devbot/environ.py
index 220b39e..1e3dc53 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -40,7 +40,7 @@ def _setup_variables():
               sysconfig.get_python_lib(prefix=config.prefix_dir,
                                        plat_specific=True))
     _add_path("PYTHONPATH",
-              os.path.dirname(config.devbot_dir))
+              os.path.dirname(os.path.dirname(__file__)))
 
     _add_path("XDG_DATA_DIRS", "/usr/share")
     _add_path("XDG_DATA_DIRS", config.share_dir)
--
cgit v0.9.1