summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-03 17:43:46 +0000
committerGerrit Code Review <review@openstack.org>2012-01-03 17:43:46 +0000
commitfb38ebaab81e66de5e4b71d216ece438f31a81b9 (patch)
treeb24533ad6f97a44c0604f6b4f80133be249aee24
parent522e35bee576ff2aee606917acb0b8bf027a6aaa (diff)
parentf9ec38578b52f807a8d40deee5c37b84f9506dae (diff)
Merge "Install a good version of pip in the venv."
-rw-r--r--tools/install_venv.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 35afb4437..6dfcb3f17 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -188,7 +188,8 @@ def create_virtualenv(venv=VENV, no_site_packages=True):
run_command(['virtualenv', '-q', VENV])
print 'done.'
print 'Installing pip in virtualenv...',
- if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip():
+ if not run_command(['tools/with_venv.sh', 'easy_install',
+ 'pip>1.0']).strip():
die("Failed to install pip.")
print 'done.'