1. devstack
  2. Commit 7ebe8e0751dab545091e0b114589087009cc4e22
Browse code

Don't install pbr in a venv

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

Robert Collins authored on 2015/06/23 06:41:21
Showing 1 changed files
lib/infra
History View file @ 7ebe8e0
... ... 
@@ -37,6 +37,10 @@ function install_infra {
37 37 
     PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr
38 38 
     PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
39 39
40 
+    # Unset the PIP_VIRTUAL_ENV so that PBR does not end up trapped
41 
+    # down the VENV well
42 
+    unset PIP_VIRTUAL_ENV
43 
+
40 44 
     # Install pbr
41 45 
     if use_library_from_git "pbr"; then
42 46 
         git_clone_by_name "pbr"