openstack/devstack
Code Issues Proposed changes

Don't install pbr in a venv

Browse Source 
Because PIP_VIRTUAL_ENV was set for the installation of requirements,
and left around in scope, the installation of pbr no longer happened
in a global context, it instead landed inside the virtual
env. Unsetting the variable after requirements install gets us back to
where we expect.

This was an unintended side effect of the requirements-venv patch.

Change-Id: I2c4cb4305fec81a5fd237edabee78874ccd0da22
This commit is contained in:
Robert Collins 2015-06-23 09:41:21 +12:00 committed by Sean Dague
parent 3904fb8832
commit 7ebe8e0751
1 changed files with 4 additions and 0 deletions
Show Stats 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 $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
if use_library_from_git "pbr"; then
git_clone_by_name "pbr"