RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:17:35 +00:00
Code Issues Activity Actions

Ports: Make Python version check work with suffixed versions

Browse source 
E.g. a1, b1, rc1. Simply don't parse anything beyond major and minor.
This commit is contained in:
Linus Groh 2021-08-03 19:18:56 +01:00
parent a613e00caa
commit 5a0a426c18
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/python3/package.sh
View file

@ -33,7 +33,7 @@ pre_configure() {
if [ "$1" != "showproperty" ]; then if [ "$1" != "showproperty" ]; then
if [ -x "$(command -v python3)" ]; then if [ -x "$(command -v python3)" ]; then
# Check if major and minor version of python3 are matching # Check if major and minor version of python3 are matching
if ! python3 -c "import sys; major, minor, _ = map(int, '${PYTHON_VERSION}'.split('.')); sys.exit(not (sys.version_info.major == major and sys.version_info.minor == minor))"; then if ! python3 -c "import sys; major, minor = map(int, '${PYTHON_VERSION}'.split('.')[:2]); sys.exit(not (sys.version_info.major == major and sys.version_info.minor == minor))"; then
echo "Error: python3 version does not match needed version to build ${PYTHON_VERSION}" >&2 echo "Error: python3 version does not match needed version to build ${PYTHON_VERSION}" >&2
echo "Build this Python version on your host using Toolchain/BuildPython.sh or install it otherwise and try again." >&2 echo "Build this Python version on your host using Toolchain/BuildPython.sh or install it otherwise and try again." >&2
exit 1 exit 1