openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Run package-intalls with py3k if we must"

This commit is contained in:
Jenkins 2016-01-19 05:58:58 +00:00 committed by Gerrit Code Review
parent e52fbdc598 d1e32f80a6
commit af85ea066a
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/dib-python/pre-install.d/01-dib-python
View File

@ -6,9 +6,7 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
which which || install-packages which python_path=$(command -v python2 || command -v python3)
python_path=$(which python2 || which python3)
if [ -z "$python_path" ]; then if [ -z "$python_path" ]; then
echo "Could not find python2 or python3 executable." echo "Could not find python2 or python3 executable."
exit 1 exit 1

2
elements/package-installs/bin/package-installs-v2
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/local/bin/dib-python
# Copyright 2014 Hewlett-Packard Development Company, L.P. # Copyright 2014 Hewlett-Packard Development Company, L.P.
# #

1
elements/package-installs/element-deps
View File

@ -1 +1,2 @@
dib-python
pkg-map pkg-map

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

@ -5,4 +5,6 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
sudo -E $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json python_path=$(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