diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-27 03:52:34 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-07-27 03:52:34 +0000 |
| commit | 01e481f508bb6f297949b4d1a3499239dcfb069e (patch) | |
| tree | 0aa4526882f27a9cb373c698307abfc5aaf87a2e | |
| parent | 6c4a09b925907a6e4bc1d1a8df929e22227b2c37 (diff) | |
| parent | 4373ca830fe93ddff70cf02bc366303d6b001ae9 (diff) | |
| download | nova-01e481f508bb6f297949b4d1a3499239dcfb069e.tar.gz nova-01e481f508bb6f297949b4d1a3499239dcfb069e.tar.xz nova-01e481f508bb6f297949b4d1a3499239dcfb069e.zip | |
A few minor fixes to the virtualenv installer that were breaking on ubuntu.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tools/activate_venv.sh | 1 | ||||
| -rw-r--r-- | tools/install_venv.py | 3 | ||||
| -rwxr-xr-x | tools/with_venv.sh | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -15,7 +15,7 @@ clean: rm -rf keys rm -rf instances rm -rf networks - rm run_tests.err.log + rm -f run_tests.err.log clean-all: clean rm -rf $(venv) diff --git a/tools/activate_venv.sh b/tools/activate_venv.sh index d12cb3491..376db5b96 100644 --- a/tools/activate_venv.sh +++ b/tools/activate_venv.sh @@ -1,3 +1,4 @@ +#!/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 720dcc0d9..c35af434b 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -5,7 +5,6 @@ Installation script for Nova's development virtualenv import os import subprocess import sys -import textwrap ROOT = os.path.dirname(os.path.dirname(__file__)) @@ -80,7 +79,7 @@ def print_help(): $ tools/with_venv.sh <your command> - Also, run_tests.sh will automatically use the virtualenv. + Also, make test will automatically use the virtualenv. """ print help diff --git a/tools/with_venv.sh b/tools/with_venv.sh index 51468a334..99d1ac18f 100755 --- a/tools/with_venv.sh +++ b/tools/with_venv.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash TOOLS=`dirname $0` VENV=$TOOLS/../.nova-venv source $VENV/bin/activate && $@ |