More changes for installation of matchbox/tinderbox

4 files changed, 13 insertions, 2 deletions

diff --git a/src/collagen/matchbox/db/__init__.py b/src/collagen/matchbox/db/__init__.py
index 6dca0b1..29e92d1 100644
--- a/src/collagen/matchbox/db/__init__.py
+++ b/src/collagen/matchbox/db/__init__.py
@@ -1,6 +1,5 @@
 import sys
 import os
-import settings as config
 from django.conf import settings
 os.environ["DJANGO_SETTINGS_MODULE"]="db_config"
 
diff --git a/src/collagen/tinderbox/logger.py b/src/collagen/tinderbox/logger.py
index a90f578..6ace503 100644
--- a/src/collagen/tinderbox/logger.py
+++ b/src/collagen/tinderbox/logger.py
@@ -1,7 +1,7 @@
 import os
 from errno import *
 import logging as log
-import config
+import tinderbox_config as config
 
 fhandler = None
 
diff --git a/src/matchbox.py b/src/matchbox.py
index dbafaef..d24e5e1 100644
--- a/src/matchbox.py
+++ b/src/matchbox.py
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+
+import sys
+import os
+sys.path.insert(0, os.getcwd())
+
 from collagen.matchbox import MatchboxServer as ms
 
 s = ms('localhost',10000)
diff --git a/src/tinderbox.py b/src/tinderbox.py
index 83d138a..d1bfbb4 100644
--- a/src/tinderbox.py
+++ b/src/tinderbox.py
@@ -1,3 +1,9 @@
+#!/usr/bin/python
+
+import sys
+import os
+sys.path.insert(0, os.getcwd())
+
 from collagen.tinderbox import Tinderbox, Package
 
 tb = Tinderbox()