Commit250f259

committed

pg_basebackup streaming: adjust version check msg

Allow for translatable string, rather than use "or"

1 parent7c7b1f4 commit250f259Copy full SHA for 250f259

File tree

+13

-3

lines changed

+13

-3

lines changed

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -367,14 +367,24 @@ CheckServerVersionForStreaming(PGconn *conn)`
`367`	`367`	`minServerMajor=903;`
`368`	`368`	`maxServerMajor=PG_VERSION_NUM /100;`
`369`	`369`	`serverMajor=PQserverVersion(conn) /100;`
`370`		`-if (serverMajor<minServerMajor\|\|serverMajor>maxServerMajor)`
	`370`	`+if (serverMajor<minServerMajor)`
`371`	`371`	`{`
`372`	`372`	`constchar*serverver=PQparameterStatus(conn,"server_version");`
`373`	`373`
`374`		`-fprintf(stderr,_("%s: incompatible server version %s;streaming is only supported withserverversion %s\n"),`
	`374`	`+fprintf(stderr,_("%s: incompatible server version %s;client does not support streaming fromserverversions older than %s\n"),`
`375`	`375`	`progname,`
`376`	`376`	`serverver ?serverver :"'unknown'",`
`377`		`-"9.3 or 9.4");`
	`377`	`+"9.3");`
	`378`	`+return false;`
	`379`	`+}`
	`380`	`+elseif (serverMajor>maxServerMajor)`
	`381`	`+{`
	`382`	`+constchar*serverver=PQparameterStatus(conn,"server_version");`
	`383`	`+`
	`384`	`+fprintf(stderr,_("%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"),`
	`385`	`+progname,`
	`386`	`+serverver ?serverver :"'unknown'",`
	`387`	`+PG_VERSION);`
`378`	`388`	`return false;`
`379`	`389`	`}`
`380`	`390`	`return true;`

Comments

(0)