Commit5daa50f

committed

Revert "pg_resetwal: Improve error with wrong/missing data directory"

This reverts commit1d863c2.This broke specifying the data directory as a relative path.Reported-by: Hayato Kuroda (Fujitsu) <kuroda.hayato@fujitsu.com>Discussion:https://www.postgresql.org/message-id/flat/TYAPR01MB58664AD301F511B1EA5B72B4F5C0A%40TYAPR01MB5866.jpnprd01.prod.outlook.com

1 parentd40d827 commit5daa50fCopy full SHA for 5daa50f

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -345,17 +345,17 @@ main(int argc, char *argv[])`
`345`	`345`
`346`	`346`	`get_restricted_token();`
`347`	`347`
`348`		`-if (chdir(DataDir)<0)`
`349`		`-pg_fatal("could not change directory to \"%s\": %m",`
`350`		`-DataDir);`
`351`		`-`
`352`	`348`	`/* Set mask based on PGDATA permissions */`
`353`	`349`	`if (!GetDataDirectoryCreatePerm(DataDir))`
`354`	`350`	`pg_fatal("could not read permissions of directory \"%s\": %m",`
`355`	`351`	`DataDir);`
`356`	`352`
`357`	`353`	`umask(pg_mode_mask);`
`358`	`354`
	`355`	`+if (chdir(DataDir)<0)`
	`356`	`+pg_fatal("could not change directory to \"%s\": %m",`
	`357`	`+DataDir);`
	`358`	`+`
`359`	`359`	`/* Check that data directory matches our server version */`
`360`	`360`	`CheckDataVersion();`
`361`	`361`

Comments

(0)