aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Amicel <ronan.amicel@gmail.com>2012-10-23 17:15:32 +0200
committerRonan Amicel <ronan.amicel@gmail.com>2012-10-23 17:15:43 +0200
commit12b93dead8d1266930bf9de81b6718f2942a4d17 (patch)
tree475ae10dcc179cb3988d898c3d3674bc6398effd
parentPrepare 0.7.0 release (diff)
downloadfabtools-12b93dead8d1266930bf9de81b6718f2942a4d17.tar.xz
Fix potential issue with pip version parsing
In some cases, warnings could be emitted on stderr, which would break our version parsing.
-rw-r--r--fabtools/python.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/fabtools/python.py b/fabtools/python.py
index aa6b92a..1072ff5 100644
--- a/fabtools/python.py
+++ b/fabtools/python.py
@@ -27,7 +27,7 @@ def is_pip_installed(version=None):
.. _pip: http://www.pip-installer.org/
"""
with settings(hide('running', 'warnings', 'stderr', 'stdout'), warn_only=True):
- res = run('pip --version')
+ res = run('pip --version', combine_stderr=True)
if res.failed:
return False
if version is None: