diff options
| author | Bruce Momjian <bruce@momjian.us> | 2018-01-05 14:46:26 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2018-01-05 14:46:26 -0500 |
| commit | 5f45c72e3eea611bf7e06e0dd841c6f610c4d839 (patch) | |
| tree | a68a483c16c879932ed2102b81f47a4d97a7e573 /src | |
| parent | b3b058539c27c36a1b28c268e9179660ef0b0293 (diff) | |
| download | postgresql-5f45c72e3eea611bf7e06e0dd841c6f610c4d839.tar.gz postgresql-5f45c72e3eea611bf7e06e0dd841c6f610c4d839.zip | |
pg_upgrade: revert part of patch for ease of translation
Revert part of 959ee6d267fb24e667fc64e9837a376e236e84a5 .
Backpatch-through: 10
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/server.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index a123699d24c..219d00daa36 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -310,8 +310,13 @@ 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 == &old_cluster ? "source" : "target"); + { + /* keep error strings separate to ease translation */ + 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; } |