diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-11 17:32:12 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-11 17:32:12 -0800 |
| commit | 7cfca5208766539ae368a9f0b8daba6103041f7f (patch) | |
| tree | f273743d16a89926871d801ce05d22a8816805cd /tools | |
| parent | eb48bdce5ad131245977dff50030f5561b8809c1 (diff) | |
| parent | 78882d496b94915b8a6e2f2edce13e8129299982 (diff) | |
merge trunk, fix conflict
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 3 |
1 files changed, 2 insertions, 1 deletions
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.' |