diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2019-09-09 08:56:33 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2019-09-09 09:03:32 -0400 |
| commit | decff80ec8bc4487d16f401ed3c41b735b9544e1 (patch) | |
| tree | b891e6e9771dac271ecb4371d55eed1c210d0ca1 | |
| parent | 87ee1587c94d04e8c91d9346cd632369bede586c (diff) | |
| download | postgresql-decff80ec8bc4487d16f401ed3c41b735b9544e1.tar.gz postgresql-decff80ec8bc4487d16f401ed3c41b735b9544e1.zip | |
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.
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 30e5eedc6d8..cb46e1eb23d 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -224,8 +224,11 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B 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 @@ -238,7 +241,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 |