openstack
/
nova
Code Issues Proposed changes

Fixes to the virtualenv installer

This commit is contained in:
Vishvananda Ishaya 2010-07-26 18:57:24 -07:00
parent 00c2791230
commit 4373ca830f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -15,7 +15,7 @@ clean:
rm -rf keys rm -rf keys
rm -rf instances rm -rf instances
rm -rf networks rm -rf networks
rm run_tests.err.log rm -f run_tests.err.log
clean-all: clean clean-all: clean
rm -rf $(venv) rm -rf $(venv)

1
tools/activate_venv.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
_TOOLS=`dirname $0` _TOOLS=`dirname $0`
_VENV=$_TOOLS/../.nova-venv _VENV=$_TOOLS/../.nova-venv
source $_VENV/bin/activate source $_VENV/bin/activate

3
tools/install_venv.py
View File

@ -5,7 +5,6 @@ Installation script for Nova's development virtualenv
import os import os
import subprocess import subprocess
import sys import sys
import textwrap
ROOT = os.path.dirname(os.path.dirname(__file__)) ROOT = os.path.dirname(os.path.dirname(__file__))
@ -80,7 +79,7 @@ def print_help():
$ tools/with_venv.sh <your command> $ 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 print help

2
tools/with_venv.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
TOOLS=`dirname $0` TOOLS=`dirname $0`
VENV=$TOOLS/../.nova-venv VENV=$TOOLS/../.nova-venv
source $VENV/bin/activate && $@ source $VENV/bin/activate && $@