From 73ff3a0abbbcb2c623731b88f2d1334bc67e5820 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Mon, 9 Sep 2019 08:56:33 -0400 Subject: [PATCH] Prevent msys2 conversion of "cmd /c" switch to a file path 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index c9de4f8a7e..a5169a13e5 100644 --- 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 ;; *) sh ./analyze_new_cluster.sh ;; esac @@ -258,7 +261,7 @@ if [ -n "$pg_dumpall2_status" ]; then fi case $testhost in - MINGW*) cmd /c delete_old_cluster.bat ;; + MINGW*) MSYS2_ARG_CONV_EXCL=/c cmd /c delete_old_cluster.bat ;; *) sh ./delete_old_cluster.sh ;; esac