Browse code

Merge "Don't install pbr in a venv"

Jenkins authored on 2015/06/24 03:31:38
Showing 1 changed files
... ...
@@ -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"