Commit3e6f01f

committed

pg_upgrade: revert part of patch for ease of translation

Revert part of959ee6d .Backpatch-through: 10

1 parent959ee6d commit3e6f01fCopy full SHA for 3e6f01f

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -310,8 +310,13 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)`
`310`	`310`	`* running.`
`311`	`311`	`*/`
`312`	`312`	`if (!pg_ctl_return)`
`313`		`-pg_fatal("pg_ctl failed to start the %s server, or connection failed\n",`
`314`		`-cluster==&old_cluster ?"source" :"target");`
	`313`	`+{`
	`314`	`+/* keep error strings separate to ease translation */`
	`315`	`+if (cluster==&old_cluster)`
	`316`	`+pg_fatal("pg_ctl failed to start the source server, or connection failed\n");`
	`317`	`+else`
	`318`	`+pg_fatal("pg_ctl failed to start the target server, or connection failed\n");`
	`319`	`+}`
`315`	`320`
`316`	`321`	`return true;`
`317`	`322`	`}`

Comments

(0)