From 4199dab2e761efc6cb2d9af353f5f09c943a2d2f Mon Sep 17 00:00:00 2001
From: Paul Voccio <pvoccio@castor.local>
Date: Mon, 26 Jul 2010 23:23:44 -0500
Subject: [PATCH] resolving conflict w/ merge, cleaning up virtenv setups

---
 tools/activate_venv.sh | 4 ----
 tools/install_venv.py  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 tools/activate_venv.sh

diff --git a/tools/activate_venv.sh b/tools/activate_venv.sh
deleted file mode 100644
index 376db5b964e4..000000000000
--- 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 c35af434b45e..0b35fc8e9f80 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: