NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit801b261

committed

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

Modern versions of msys2 have changed the treatment of "cmd /c" so thatthe runtime will try to convert the switch to a native file path. Thispatch adds a setting to inhibit that behaviour.Discussion:https://postgr.es/m/3227042f-cfcc-745a-57dd-fb8c471f8ddf@2ndQuadrant.comBackpatch to all live branches.

1 parentd0a98e1 commit801b261Copy full SHA for 801b261

File tree

1 file changed

-2

lines changed

src/bin/pg_upgrade
- test.sh

1 file changed

-2

lines changed

`‎src/bin/pg_upgrade/test.sh`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,11 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B`
`240`	`240`
`241`	`241`	`pg_ctl start -l"$logdir/postmaster2.log" -o"$POSTMASTER_OPTS" -w`
`242`	`242`
	`243`	`+# In the commands below we inhibit msys2 from converting the "/c" switch`
	`244`	`+# in "cmd /c" to a file system path.`
	`245`	`+`
`243`	`246`	`case$testhostin`
`244`		`-MINGW*)cmd /c analyze_new_cluster.bat ;;`
	`247`	`+MINGW*)MSYS2_ARG_CONV_EXCL=/ccmd /c analyze_new_cluster.bat ;;`
`245`	`248`	`*)sh ./analyze_new_cluster.sh ;;`
`246`	`249`	`esac`
`247`	`250`
`@@ -254,7 +257,7 @@ if [ -n "$pg_dumpall2_status" ]; then`
`254`	`257`	`fi`
`255`	`258`
`256`	`259`	`case$testhostin`
`257`		`-MINGW*)cmd /c delete_old_cluster.bat ;;`
	`260`	`+MINGW*)MSYS2_ARG_CONV_EXCL=/ccmd /c delete_old_cluster.bat ;;`
`258`	`261`	`*) sh ./delete_old_cluster.sh ;;`
`259`	`262`	`esac`
`260`	`263`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit801b261

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/test.sh`

0 commit comments