diff options
| author | Lorin Hochstein <lorin@isi.edu> | 2011-01-12 01:34:05 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-12 01:34:05 +0000 |
| commit | 03fef88e884d49fb5f24d7798ba6f74c6da6864f (patch) | |
| tree | 581a4efe591f78a60a2f9a300e9b96e55ed2fe8e | |
| parent | 6d895bf668c388fa4c2f92a1b9a6531550246273 (diff) | |
| parent | d09772b6b1701eaf1ca02b9afafd93b4cafe2342 (diff) | |
| download | nova-03fef88e884d49fb5f24d7798ba6f74c6da6864f.tar.gz nova-03fef88e884d49fb5f24d7798ba6f74c6da6864f.tar.xz nova-03fef88e884d49fb5f24d7798ba6f74c6da6864f.zip | |
Fixes bug #701575: run_tests.sh fails with a meaningless error if virtualenv is not installed. Proposed fix tries to use easy_install to install virtualenv if not present.
Test by doing "run_tests.sh -V" on a system that has easy_install installed but not virtualenv.
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | tools/install_venv.py | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -24,6 +24,7 @@ Josh Kearney <josh.kearney@rackspace.com> Joshua McKenty <jmckenty@gmail.com> Justin Santa Barbara <justin@fathomdb.com> Ken Pepple <ken.pepple@gmail.com> +Lorin Hochstein <lorin@isi.edu> Matt Dietz <matt.dietz@rackspace.com> Michael Gundlach <michael.gundlach@rackspace.com> Monsyne Dragon <mdragon@rackspace.com> diff --git a/tools/install_venv.py b/tools/install_venv.py index 32c372352..4e3941210 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -66,7 +66,8 @@ def check_dependencies(): # Try installing it via easy_install... if HAS_EASY_INSTALL: print 'Installing virtualenv via easy_install...', - if not run_command(['which', 'easy_install']): + if not (run_command(['which', 'easy_install']) and + run_command(['easy_install', 'virtualenv'])): die('ERROR: virtualenv not found.\n\nNova development requires virtualenv,' ' please install it using your favorite package management tool') print 'done.' |