git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Prevent msys2 conversion of "cmd /c" switch to a file path

author Andrew Dunstan <andrew@dunslane.net>

Mon, 9 Sep 2019 12:56:33 +0000 (08:56 -0400)

committer Andrew Dunstan <andrew@dunslane.net>

Mon, 9 Sep 2019 13:04:07 +0000 (09:04 -0400)

Modern versions of msys2 have changed the treatment of "cmd /c" so that
the runtime will try to convert the switch to a native file path. This
patch adds a setting to inhibit that behaviour.

Discussion: https://postgr.es/m/3227042f-cfcc-745a-57dd-fb8c471f8ddf@2ndQuadrant.com

Backpatch to all live branches.

src/bin/pg_upgrade/test.sh patch | blob | blame | history

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh

index c9de4f8a7e0985fe18d4bf66a74bfc937d79b6e8..a5169a13e5a6eb083e58470fa5af462e1344f9d9 100644 (file)

--- a/src/bin/pg_upgrade/test.sh

+++ b/src/bin/pg_upgrade/test.sh

@@ -244,8 +244,11 @@ esac

pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w

+# In the commands below we inhibit msys2 from converting the "/c" switch

+# in "cmd /c" to a file system path.

case $testhost in

- MINGW*) cmd /c analyze_new_cluster.bat ;;

+ MINGW*) MSYS2_ARG_CONV_EXCL=/c cmd /c analyze_new_cluster.bat ;;