From 3e6f01fd7d9b01b17626a6bc38cf664354eede71 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 5 Jan 2018 14:46:27 -0500 Subject: [PATCH] pg_upgrade: revert part of patch for ease of translation Revert part of 959ee6d267fb24e667fc64e9837a376e236e84a5 . Backpatch-through: 10 --- src/bin/pg_upgrade/server.c | 9 +++++++-- 1 file 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; } -- 2.39.5