diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-07-14 19:20:21 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2017-07-14 19:21:34 -0400 |
| commit | 837255cc81fb59b12f5a70ac2a8a9850bccf13e0 (patch) | |
| tree | 59436ebfad738c69539afc346ff182664e39c7c1 /src/bin/pg_upgrade/server.c | |
| parent | decb08ebdf07f2fea4b6bb43380366ef5defbafb (diff) | |
pg_upgrade i18n: Fix "%s server/cluster" wording
The original wording was impossible to translate correctly.
Discussion: https://postgr.es/m/20170523002827.lzc2jkzh2gubclqb@alvherre.pgsql
Diffstat (limited to 'src/bin/pg_upgrade/server.c')
| -rw-r--r-- | src/bin/pg_upgrade/server.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 23ba6a2e11b..58e35938967 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -285,9 +285,14 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) PQerrorMessage(conn)); if (conn) PQfinish(conn); - pg_fatal("could not connect to %s postmaster started with the command:\n" - "%s\n", - CLUSTER_NAME(cluster), cmd); + if (cluster == &old_cluster) + pg_fatal("could not connect to source postmaster started with the command:\n" + "%s\n", + cmd); + else + pg_fatal("could not connect to target postmaster started with the command:\n" + "%s\n", + cmd); } PQfinish(conn); @@ -297,8 +302,12 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) * running. */ if (!pg_ctl_return) - pg_fatal("pg_ctl failed to start the %s server, or connection failed\n", - CLUSTER_NAME(cluster)); + { + if (cluster == &old_cluster) + pg_fatal("pg_ctl failed to start the source server, or connection failed\n"); + else + pg_fatal("pg_ctl failed to start the target server, or connection failed\n"); + } return true; } |