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

Revert "Revert Xenial to Python 2"

Browse Source 
We landed the fix for this in
Icdb769541eee9793f261b4b8ec563be76ee13fe2.

This reverts commit 2978ff885b.

Change-Id: Iecfc41ab2aad57bc4f6f86a13810b534d19a8fd5
This commit is contained in:
Gregory Haynes 2016-12-21 17:39:27 +00:00 committed by Ian Wienand
parent 54b2733ad8
commit 7603f97cad
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/dib-python/environment.d/50-dib-python-version
View File

@ -5,8 +5,6 @@ if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
DIB_PYTHON_VERSION=2 DIB_PYTHON_VERSION=2
elif [ "$DIB_RELEASE" == "trusty" ]; then elif [ "$DIB_RELEASE" == "trusty" ]; then
DIB_PYTHON_VERSION=2 DIB_PYTHON_VERSION=2
elif [ "$DIB_RELEASE" == "xenial" ]; then
DIB_PYTHON_VERSION=2
fi fi
elif [ "$DISTRO_NAME" == "debian" ]; then elif [ "$DISTRO_NAME" == "debian" ]; then
DIB_PYTHON_VERSION=2 DIB_PYTHON_VERSION=2

10
elements/ubuntu/pre-install.d/00-install-python
View File

@ -1,10 +0,0 @@
#!/bin/bash
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
# hack to get python into Xenial python3 only images, while we
# work-around issues.
apt-get -y install python || true