Use DIB_PYTHON_EXEC to run commands
DIB_PYTHON_EXEC was added in I5fab0e192c3a2dad8f60e821c184479e24e33bcd to export the python that disk-image-create is running under. If dib is installed with python3 then just calls "python" (python2) to run sub-scripts, it fails to find itself. This has been tested in devstack gates that use py3x Change-Id: Ia1028972bfc0517b468b279aab9decdbcd7424ca
This commit is contained in:
parent
10baebe1e4
commit
f06231ee08
@ -31,7 +31,7 @@ if [ -z "$_LIB" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
_BASE_ELEMENT_DIR=$(python -c '
|
||||
_BASE_ELEMENT_DIR=$(${DIB_PYTHON_EXEC:-python} -c '
|
||||
import diskimage_builder.paths
|
||||
diskimage_builder.paths.show_path("elements")')
|
||||
|
||||
@ -104,7 +104,7 @@ function show_options () {
|
||||
}
|
||||
|
||||
function show_version() {
|
||||
python -c "from diskimage_builder import version; print(version.version_info.version_string())"
|
||||
${DIB_PYTHON_EXEC:-python} -c "from diskimage_builder import version; print(version.version_info.version_string())"
|
||||
}
|
||||
|
||||
DIB_DEBUG_TRACE=${DIB_DEBUG_TRACE:-0}
|
||||
|
Loading…
Reference in New Issue
Block a user