Merge lp:~vishvananda/nova/virtualenv-fix into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

A few minor fixes to the virtualenv installer that were breaking on ubuntu.

A few minor fixes to the virtualenv installer that were breaking on ubuntu.

There is one remaining issue: m2crypto fails to build and install due to lack of dependencies. On ubuntu this can be fixed by running apt-get build-dep python-m2crypto. Not sure of the best way to make the installer check for the dependencies, since there are multiple.

[Monty Taylor (mordred)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

yep, looks good.

review: Approve

[Soren Hansen (soren)]

On Tue, Jul 27, 2010 at 02:02:42AM -0000, vishvananda wrote:
> There is one remaining issue: m2crypto fails to build and install due
> to lack of dependencies. On ubuntu this can be fixed by running
> apt-get build-dep python-m2crypto. Not sure of the best way to make
> the installer check for the dependencies, since there are multiple.

This may seem like a silly question (I don't use virtualenv myself), but
why not just use the python-m2crypto package from Ubuntu?

=== modified file 'Makefile'
--- Makefile	2010-07-26 21:16:49 +0000
+++ Makefile	2010-07-27 02:02:41 +0000
@@ -15,7 +15,7 @@
 	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)

=== modified file 'tools/activate_venv.sh'
--- tools/activate_venv.sh	2010-07-26 21:16:49 +0000
+++ tools/activate_venv.sh	2010-07-27 02:02:41 +0000
@@ -1,3 +1,4 @@
+#!/bin/bash
 _TOOLS=`dirname $0`
 _VENV=$_TOOLS/../.nova-venv
 source $_VENV/bin/activate

=== modified file 'tools/install_venv.py'
--- tools/install_venv.py	2010-07-26 21:16:49 +0000
+++ tools/install_venv.py	2010-07-27 02:02:41 +0000
@@ -5,7 +5,6 @@
 import os
 import subprocess
 import sys
-import textwrap
 
 
 ROOT = os.path.dirname(os.path.dirname(__file__))
@@ -80,7 +79,7 @@
 
  $ 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
 

=== modified file 'tools/with_venv.sh'
--- tools/with_venv.sh	2010-07-26 21:16:49 +0000
+++ tools/with_venv.sh	2010-07-27 02:02:41 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 TOOLS=`dirname $0`
 VENV=$TOOLS/../.nova-venv
 source $VENV/bin/activate && $@