sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Prioritize venv python on host"

Browse Source
This commit is contained in:
Jenkins 2016-04-18 23:17:28 +00:00 committed by Gerrit Code Review
commit 1fabb01a4f
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 -eu
set -o pipefail 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 sudo -E $python_path $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json