From 0398e4a48a7e1cf72fdd89608ba487cdd2947176 Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Sat, 24 Apr 2021 15:47:31 -0700 Subject: [PATCH] Ports: Fix python3 package so linting script doesn't error out. I have my environment configured to use https://pre-commit.com/. I guess the scripts were changed recently to lint all ports, and the python port was barfing on my system because of this bug. --- Ports/python3/package.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Ports/python3/package.sh b/Ports/python3/package.sh index 3342f4896b..50c83db8c0 100755 --- a/Ports/python3/package.sh +++ b/Ports/python3/package.sh @@ -30,15 +30,18 @@ post_configure() { run cp "${SERENITY_SOURCE_DIR}/Ports/${port}/Setup.local" "Modules/Setup.local" } -if [ -x "$(command -v python3)" ]; then - # 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 - echo "Error: python3 version does not match needed version to build ${PYTHON_VERSION}" >&2 +# Note: The showproperty command is used when linting ports, we don't actually need python at this time. +if [ "$1" != "showproperty" ]; then + if [ -x "$(command -v python3)" ]; then + # 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 + 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 + exit 1 + fi + else + echo "Error: python3 is not installed but is required 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 exit 1 fi -else - echo "Error: python3 is not installed but is required 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 - exit 1 fi