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

Merge "squash-package-install to use the correct python"

Browse Source
This commit is contained in:
Jenkins 2017-03-14 01:35:42 +00:00 committed by Gerrit Code Review
commit 756923c85b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage_builder/disk_image_create.py
View File

@ -60,6 +60,10 @@ def main():
# pre-seed some paths for the shell script # pre-seed some paths for the shell script
environ['_LIB'] = diskimage_builder.paths.get_path('lib') environ['_LIB'] = diskimage_builder.paths.get_path('lib')
# export the path to the current python
if not os.environ.get('DIB_PYTHON_EXEC'):
os.environ['DIB_PYTHON_EXEC'] = sys.executable
# we have to handle being called as "disk-image-create" or # we have to handle being called as "disk-image-create" or
# "ramdisk-image-create". ramdisk-iamge-create is just a symlink # "ramdisk-image-create". ramdisk-iamge-create is just a symlink
# to disk-image-create # to disk-image-create

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

@ -5,8 +5,4 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
# Search for python first in case we are in a venv with python3 which sudo -E $DIB_PYTHON_EXEC $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json
# 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