openstack/diskimage-builder
Code Issues Proposed changes

Prioritize venv python on host

Browse Source 
If we are being run from a python 3 virtualenv where python2 is also
available on the host we will use the hosts' python2 over the virtualenv
python3 (even if the virtualenv is higher precedence in PATH).

Change-Id: I9a25b9e45845a4121aab8250fd53c6f006825742
This commit is contained in:
Gregory Haynes 2016-02-28 20:44:16 -08:00
parent 103b7dea6d
commit cb15e7ef33
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/package-installs/extra-data.d/99-squash-package-install
View File

@ -5,6 +5,8 @@ fi
set -eu
set -o pipefail
python_path=$(command -v python2 || command -v python3)
# Search for python first in case we are in a venv with python3 which
# should take precedence
python_path=$(command -v python || command -v python2 || command -v python3)
sudo -E $python_path $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json