From cc96a85c5cb5c5895581f8474d8d62be7dce4e3e Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 26 Nov 2025 17:12:22 +0100 Subject: [PATCH v3] Check for correct version of perltidy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pgperltidy requires a particular version of perltidy, but the version wasn't checked like how pgindent checks the underlying indent binary. Fix by checking the version of perltidy and error out if an incorrect version is used. Author: Daniel Gustafsson Reported-by: Tom Lane Reviewed-by: Dagfinn Ilmari Mannsåker Reviewed-by: Álvaro Herrera Reviewed-by: Tom Lane Reviewed-by: Andrew Dunstan Discussion: https://postgr.es/m/1209850.1764092152@sss.pgh.pa.us --- src/tools/pgindent/pgperltidy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tools/pgindent/pgperltidy b/src/tools/pgindent/pgperltidy index 6af27d21d55..87838d6bde3 100755 --- a/src/tools/pgindent/pgperltidy +++ b/src/tools/pgindent/pgperltidy @@ -7,6 +7,12 @@ set -e # set this to override default perltidy program: PERLTIDY=${PERLTIDY:-perltidy} +PERLTIDY_VERSION=20230309 +if ! $PERLTIDY -v | grep -q $PERLTIDY_VERSION; then + echo "You do not appear to have $PERLTIDY version $PERLTIDY_VERSION installed on your system." >&2 + exit 1 +fi + . src/tools/perlcheck/find_perl_files find_perl_files "$@" | xargs $PERLTIDY --profile=src/tools/pgindent/perltidyrc -- 2.39.3 (Apple Git-146)