summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-14 16:49:41 +0000
committerGerrit Code Review <review@openstack.org>2013-02-14 16:49:41 +0000
commita4bb232614d2d9f975617dba4c58b05dcb87a36a (patch)
tree0c021b4d9fc9fa587048660ab380fa92aea2de5b
parent399f27b4f75e1eadb9ff5f9a2c9328130ee8c7a8 (diff)
parent6a01a8c085bbb5f563490c000504d19f4d72dec0 (diff)
downloadoslo-a4bb232614d2d9f975617dba4c58b05dcb87a36a.tar.gz
oslo-a4bb232614d2d9f975617dba4c58b05dcb87a36a.tar.xz
oslo-a4bb232614d2d9f975617dba4c58b05dcb87a36a.zip
Merge "Cleanup docstring and print in install_venv_common"
-rw-r--r--tools/install_venv_common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 75e3302..00f73d7 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -58,7 +58,7 @@ class InstallVenv(object):
check_exit_code=True):
"""Runs a command in an out-of-process shell.
- Returns the output of that command. Working directory is ROOT.
+ Returns the output of that command. Working directory is self.root.
"""
if redirect_output:
stdout = subprocess.PIPE
@@ -101,7 +101,7 @@ class InstallVenv(object):
else:
self.run_command(['virtualenv', '-q', self.venv])
print 'done.'
- print 'Installing pip in virtualenv...',
+ print 'Installing pip in venv...',
if not self.run_command(['tools/with_venv.sh', 'easy_install',
'pip>1.0']).strip():
self.die("Failed to install pip.")