rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_basebackup streaming: adjust version check msg 

Allow for translatable string, rather than use "or"
This commit is contained in:
Simon Riggs 2014-05-06 22:50:06 +01:00
parent 7c7b1f4ae5
commit 250f259a44
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/pg_basebackup/receivelog.c
View File

@ -367,14 +367,24 @@ CheckServerVersionForStreaming(PGconn *conn)
minServerMajor = 903; minServerMajor = 903;
maxServerMajor = PG_VERSION_NUM / 100; maxServerMajor = PG_VERSION_NUM / 100;
serverMajor = PQserverVersion(conn) / 100; serverMajor = PQserverVersion(conn) / 100;
if (serverMajor < minServerMajor || serverMajor > maxServerMajor) if (serverMajor < minServerMajor)
{ {
const char *serverver = PQparameterStatus(conn, "server_version"); const char *serverver = PQparameterStatus(conn, "server_version");
fprintf(stderr, _("%s: incompatible server version %s; streaming is only supported with server version %s\n"), fprintf(stderr, _("%s: incompatible server version %s; client does not support streaming from server versions older than %s\n"),
progname, progname,
serverver ? serverver : "'unknown'", serverver ? serverver : "'unknown'",
"9.3 or 9.4"); "9.3");
return false;
}
else if (serverMajor > maxServerMajor)
{
const char *serverver = PQparameterStatus(conn, "server_version");
fprintf(stderr, _("%s: incompatible server version %s; client does not support streaming from server versions newer than %s\n"),
progname,
serverver ? serverver : "'unknown'",
PG_VERSION);
return false; return false;
} }
return true; return true;