Merge "Use DIB_PYTHON_EXEC to run commands"

This commit is contained in:
Jenkins 2017-04-07 20:29:30 +00:00 committed by Gerrit Code Review
commit 2d178e43e1

View File

@ -31,7 +31,7 @@ if [ -z "$_LIB" ]; then
exit 1 exit 1
fi fi
_BASE_ELEMENT_DIR=$(python -c ' _BASE_ELEMENT_DIR=$(${DIB_PYTHON_EXEC:-python} -c '
import diskimage_builder.paths import diskimage_builder.paths
diskimage_builder.paths.show_path("elements")') diskimage_builder.paths.show_path("elements")')
@ -104,7 +104,7 @@ function show_options () {
} }
function show_version() { 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} DIB_DEBUG_TRACE=${DIB_DEBUG_TRACE:-0}