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
diff --git a/lib/infra b/lib/infra
index 585e9b4..3d68e45 100644
--- a/lib/infra
+++ b/lib/infra
@@ -37,6 +37,10 @@
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"