diff options
| author | Bruce Momjian <bruce@momjian.us> | 2018-01-05 14:46:27 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2018-01-05 14:46:27 -0500 |
| commit | 3e6f01fd7d9b01b17626a6bc38cf664354eede71 (patch) | |
| tree | a42ef354d8d7463e04b357fb33b834b729440412 | |
| parent | 959ee6d267fb24e667fc64e9837a376e236e84a5 (diff) | |
| download | postgresql-3e6f01fd7d9b01b17626a6bc38cf664354eede71.tar.gz postgresql-3e6f01fd7d9b01b17626a6bc38cf664354eede71.zip | |
pg_upgrade: revert part of patch for ease of translation
Revert part of 959ee6d267fb24e667fc64e9837a376e236e84a5 .
Backpatch-through: 10
| -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 1b399a9841e..74ebaed5b2d 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; } |