Merge "Don't install pbr in a venv"

2015-06-23 18:31:38 +00:00
parent 9f56aac3f1 7ebe8e0751
commit ca4659931a
1 changed files with 4 additions and 0 deletions
--- a/lib/infra
+++ b/lib/infra
@@ -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"