Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 73ff3a0

Browse files
committed
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.
1 parent 27cc7cd commit 73ff3a0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/bin/pg_upgrade/test.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,11 @@ esac
244244

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

247+
# In the commands below we inhibit msys2 from converting the "/c" switch
248+
# in "cmd /c" to a file system path.
249+
247250
case $testhost in
248-
MINGW*) cmd /c analyze_new_cluster.bat ;;
251+
MINGW*) MSYS2_ARG_CONV_EXCL=/c cmd /c analyze_new_cluster.bat ;;
249252
*) sh ./analyze_new_cluster.sh ;;
250253
esac
251254

@@ -258,7 +261,7 @@ if [ -n "$pg_dumpall2_status" ]; then
258261
fi
259262

260263
case $testhost in
261-
MINGW*) cmd /c delete_old_cluster.bat ;;
264+
MINGW*) MSYS2_ARG_CONV_EXCL=/c cmd /c delete_old_cluster.bat ;;
262265
*) sh ./delete_old_cluster.sh ;;
263266
esac
264267

0 commit comments

Comments
 (0)