Don't use activate when starting the slave

We want to use system python when building.

2 files changed, 9 insertions, 3 deletions

diff --git a/fabfile/common.py b/fabfile/common.py
index 8e5d801..7e36c15 100644
--- a/fabfile/common.py
+++ b/fabfile/common.py
@@ -62,6 +62,11 @@ def get_virtualenv_activate(instance_name):
     return "source ~/%s/bin/activate" % instances[instance_name]["sandbox_dir"]
 
 
+def get_virtualenv_bin(instance_name, bin_name="python"):
+    sandbox_dir = instances[instance_name]["sandbox_dir"]
+    return "~/%s/bin/%s" % (sandbox_dir, bin_name)
+
+
 def get_instance_name():
     global _instance_name
 
diff --git a/fabfile/slave.py b/fabfile/slave.py
index e8e45e9..d2072ee 100644
--- a/fabfile/slave.py
+++ b/fabfile/slave.py
@@ -15,7 +15,7 @@ from fabric.contrib.files import append
 
 from common import slaves
 from common import instances
-from common import get_virtualenv_activate
+from common import get_virtualenv_activate, get_virtualenv_bin
 from common import get_instance_name
 
 
@@ -65,8 +65,9 @@ def create(instance_name=get_instance_name()):
 @roles("slave")
 def start(instance_name=get_instance_name()):
     with settings(**get_settings()):
-        with prefix(get_virtualenv_activate(instance_name)):
-            run("buildslave start %s" % instances[instance_name]["slave_dir"])
+        buildslave_bin = get_virtualenv_bin("buildslave")
+        slave_dir = instances[instance_name]["slave_dir"]
+        run("%s start %s" % (buildslave_bin, slave_dir))
 
 
 @task