openstack/devstack
Code Issues Proposed changes

Merge "Don't install pbr in a venv"

Browse Source
This commit is contained in:
Jenkins
2015-06-23 18:31:38 +00:00
committed by Gerrit Code Review
parent 9f56aac3f1 7ebe8e0751
commit ca4659931a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/infra
View File

@@ -37,6 +37,10 @@ function install_infra {
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr
PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
# Unset the PIP_VIRTUAL_ENV so that PBR does not end up trapped
# down the VENV well
unset PIP_VIRTUAL_ENV
# Install pbr # Install pbr
if use_library_from_git "pbr"; then if use_library_from_git "pbr"; then
git_clone_by_name "pbr" git_clone_by_name "pbr"