diff --git a/HISTORY.asc b/HISTORY.asc index d5e9985..fc81966 100644 --- a/HISTORY.asc +++ b/HISTORY.asc @@ -95,6 +95,13 @@ Install files now always run in byte-value (ASCII) filename order, regardless of filesystem or locale. If one install file depends on another, encode that in the filenames (e.g. a numeric prefix); see README. +== `PGXNTOOL_PGTLE_VERSION` must be an exact pg_tle range name +`make pgtle PGXNTOOL_PGTLE_VERSION=...` (and `pgtle.sh --pgtle-version`) now +errors unless the value is exactly `1.0.0-1.4.0`, `1.4.0-1.5.0` or `1.5.0+`. +A plain pg_tle version such as `1.5.0` used to be accepted silently, +generating a bogus `pg_tle/1.5.0/` directory; the error now names the range +it belongs to (`did you mean 1.5.0+?`). + Issues fixed in this release: #20, #21, #55, #87, #90, #97, #108, #111, #115, #119 2.3.0 diff --git a/README.asc b/README.asc index 11df229..0dd1aa5 100644 --- a/README.asc +++ b/README.asc @@ -373,7 +373,7 @@ Set `PGXNTOOL_PGTLE_VERSION` on the command line to a range name (`1.0.0-1.4.0`, make pgtle PGXNTOOL_PGTLE_VERSION=1.5.0+ ---- -The value must be one of those range names exactly; it is not mapped from a plain pg_tle version. Any other value (e.g. `1.5.0`) is not validated and produces a bogus `pg_tle/1.5.0/` directory. +The value must be one of those range names exactly; it is not mapped from a plain pg_tle version. Any other value is rejected with an error listing the valid ranges; for a plain pg_tle version (e.g. `1.5.0`), the error also names the range it falls in. === check-pgtle Checks if pg_tle is installed and reports the version. This target: @@ -766,7 +766,7 @@ Default: auto-detected, the first of `asciidoctor` or `asciidoc` found on `PATH` === PGXNTOOL_PGTLE_VERSION -Default: unset (generates every known pg_tle version range). Set on the command line to a range name (`1.0.0-1.4.0`, `1.4.0-1.5.0` or `1.5.0+`, exactly) to limit `make pgtle` to that one range; any other value is passed through unvalidated and generates a bogus `pg_tle//` directory. Not named `PGTLE_VERSION`: make auto-imports same-named environment variables, and that name collided silently with CI jobs that set a `PGTLE_VERSION` env var for an unrelated purpose (which pg_tle to test against). See <<_pgtle>>. +Default: unset (generates every known pg_tle version range). Set on the command line to a range name (`1.0.0-1.4.0`, `1.4.0-1.5.0` or `1.5.0+`, exactly) to limit `make pgtle` to that one range; any other value is rejected with an error. Not named `PGTLE_VERSION`: make auto-imports same-named environment variables, and that name collided silently with CI jobs that set a `PGTLE_VERSION` env var for an unrelated purpose (which pg_tle to test against). See <<_pgtle>>. === PGXNTOOL_PGTLE_TARGET_VERSION diff --git a/README.html b/README.html index e12c0de..14c32d1 100644 --- a/README.html +++ b/README.html @@ -1361,7 +1361,7 @@

-

The value must be one of those range names exactly; it is not mapped from a plain pg_tle version. Any other value (e.g. 1.5.0) is not validated and produces a bogus pg_tle/1.5.0/ directory.

+

The value must be one of those range names exactly; it is not mapped from a plain pg_tle version. Any other value is rejected with an error listing the valid ranges; for a plain pg_tle version (e.g. 1.5.0), the error also names the range it falls in.

@@ -2088,7 +2088,7 @@

8.4. PGXNTOOL_PGTLE_VERSION

-

Default: unset (generates every known pg_tle version range). Set on the command line to a range name (1.0.0-1.4.0, 1.4.0-1.5.0 or 1.5.0+, exactly) to limit make pgtle to that one range; any other value is passed through unvalidated and generates a bogus pg_tle/<value>/ directory. Not named PGTLE_VERSION: make auto-imports same-named environment variables, and that name collided silently with CI jobs that set a PGTLE_VERSION env var for an unrelated purpose (which pg_tle to test against). See pgtle.

+

Default: unset (generates every known pg_tle version range). Set on the command line to a range name (1.0.0-1.4.0, 1.4.0-1.5.0 or 1.5.0+, exactly) to limit make pgtle to that one range; any other value is rejected with an error. Not named PGTLE_VERSION: make auto-imports same-named environment variables, and that name collided silently with CI jobs that set a PGTLE_VERSION env var for an unrelated purpose (which pg_tle to test against). See pgtle.

@@ -2217,7 +2217,7 @@

diff --git a/pgtle.sh b/pgtle.sh index b891e7d..e1d8fea 100755 --- a/pgtle.sh +++ b/pgtle.sh @@ -25,9 +25,11 @@ # Extension name (required). Must match a .control file basename # in the current directory. # -# --pgtle-version VERSION -# Generate for specific pg_tle version only (optional). -# Format: 1.0.0-1.4.0, 1.4.0-1.5.0, or 1.5.0+ +# --pgtle-version RANGE +# Generate for one pg_tle version range only (optional). +# Must be exactly one of: 1.0.0-1.4.0, 1.4.0-1.5.0, or 1.5.0+ +# A plain pg_tle version (e.g. 1.5.2) is rejected, with a hint naming +# the range it falls in. # Default: Generate all supported versions # # --get-dir VERSION @@ -291,6 +293,27 @@ get_version_dir() { fi } +# Die unless $1 is exactly one of PGTLE_VERSIONS. If it parses as a plain +# pg_tle version instead, name the range --get-dir puts it in. --get-dir runs +# as a child process because get_version_dir relies on errexit to stop on a +# parse failure, and errexit is suspended inside an if condition. +validate_pgtle_range() { + local range="$1" + local r + for r in "${PGTLE_VERSIONS[@]}"; do + [ "$range" = "$r" ] && return 0 + done + + local msg="invalid pg_tle version range: '$range' + Valid ranges: ${PGTLE_VERSIONS[*]}" + local dir + if dir=$("${BASH_SOURCE[0]}" --get-dir "$range" 2>/dev/null); then + msg="$msg + '$range' looks like a pg_tle version; did you mean ${dir#pg_tle/}?" + fi + die 1 "$msg" +} + # Get pg_tle version from installed extension # Returns version string or empty if not installed get_pgtle_version() { @@ -407,6 +430,7 @@ parse_args() { shift 2 ;; --pgtle-version) + validate_pgtle_range "$2" PGTLE_VERSION="$2" shift 2 ;;