diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2014-05-06 22:50:06 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2014-05-06 22:50:06 +0100 |
| commit | 250f259a44411d341e75928401503a681844c59d (patch) | |
| tree | a45e5840db48e882488d9ecb022a26d377ce2aad /src | |
| parent | 7c7b1f4ae5ea3b1b113682d4d4e5af4356b053bc (diff) | |
| download | postgresql-250f259a44411d341e75928401503a681844c59d.tar.gz postgresql-250f259a44411d341e75928401503a681844c59d.zip | |
pg_basebackup streaming: adjust version check msg
Allow for translatable string, rather than use "or"
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/receivelog.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c index 33d2911a0e0..ca5c7f55bdf 100644 --- a/src/bin/pg_basebackup/receivelog.c +++ b/src/bin/pg_basebackup/receivelog.c @@ -367,14 +367,24 @@ CheckServerVersionForStreaming(PGconn *conn) minServerMajor = 903; maxServerMajor = PG_VERSION_NUM / 100; serverMajor = PQserverVersion(conn) / 100; - if (serverMajor < minServerMajor || serverMajor > maxServerMajor) + if (serverMajor < minServerMajor) { 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, 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 true; |