Commitbda27e5

committed

Add pg_upgrade check to make sure the user has full access permission in

the current directory; if not, throw an error.

1 parent6c19bd9 commitbda27e5Copy full SHA for bda27e5

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,11 @@ is_server_running(const char *datadir)`
`93`	`93`	`void`
`94`	`94`	`verify_directories(void)`
`95`	`95`	`{`
	`96`	`+`
	`97`	`+if (access(".",R_OK \|W_OK \|X_OK)!=0)`
	`98`	`+pg_log(PG_FATAL,`
	`99`	`+"You must have full access permissions in the current directory.\n");`
	`100`	`+`
`96`	`101`	`prep_status("Checking old data directory (%s)",old_cluster.pgdata);`
`97`	`102`	`check_data_dir(old_cluster.pgdata);`
`98`	`103`	`check_ok();`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,17 +155,13 @@ setup(char *argv0, bool live_check)`
`155`	`155`
`156`	`156`	`/* no postmasters should be running */`
`157`	`157`	`if (!live_check&&is_server_running(old_cluster.pgdata))`
`158`		`-{`
`159`	`158`	`pg_log(PG_FATAL,"There seems to be a postmaster servicing the old cluster.\n"`
`160`	`159`	`"Please shutdown that postmaster and try again.\n");`
`161`		`-}`
`162`	`160`
`163`	`161`	`/* same goes for the new postmaster */`
`164`	`162`	`if (is_server_running(new_cluster.pgdata))`
`165`		`-{`
`166`	`163`	`pg_log(PG_FATAL,"There seems to be a postmaster servicing the new cluster.\n"`
`167`	`164`	`"Please shutdown that postmaster and try again.\n");`
`168`		`-}`
`169`	`165`
`170`	`166`	`/* get path to pg_upgrade executable */`
`171`	`167`	`if (find_my_exec(argv0,exec_path)<0)`

Comments

(0)