summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Voccio <pvoccio@castor.local>2010-07-26 23:23:44 -0500
committerPaul Voccio <pvoccio@castor.local>2010-07-26 23:23:44 -0500
commit4199dab2e761efc6cb2d9af353f5f09c943a2d2f (patch)
treea198b4b62534597c95baa5a64e7d4d3a4ff8ab89
parent0082ae2ac4af5e2bf90ef8c0e49481987fd00b8e (diff)
downloadnova-4199dab2e761efc6cb2d9af353f5f09c943a2d2f.tar.gz
nova-4199dab2e761efc6cb2d9af353f5f09c943a2d2f.tar.xz
nova-4199dab2e761efc6cb2d9af353f5f09c943a2d2f.zip
resolving conflict w/ merge, cleaning up virtenv setups
-rw-r--r--tools/activate_venv.sh4
-rw-r--r--tools/install_venv.py2
2 files changed, 1 insertions, 5 deletions
diff --git a/tools/activate_venv.sh b/tools/activate_venv.sh
deleted file mode 100644
index 376db5b96..000000000
--- a/tools/activate_venv.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-_TOOLS=`dirname $0`
-_VENV=$_TOOLS/../.nova-venv
-source $_VENV/bin/activate
diff --git a/tools/install_venv.py b/tools/install_venv.py
index c35af434b..0b35fc8e9 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -72,7 +72,7 @@ def print_help():
To activate the Nova virtualenv for the extent of your current shell session
you can run:
- $ source tools/activate_venv.sh
+ $ source .nova-venv/bin/activate
Or, if you prefer, you can run commands in the virtualenv on a case by case
basis by running: