pg_upgrade: revert part of patch for ease of translation

Revert part of 959ee6d267fb24e667fc64e9837a376e236e84a5 .

Backpatch-through: 10

diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 1b399a9841e03676edfbe5f11ef73497e983fdb1..74ebaed5b2db6e10d9cee5afa45885bd55dc9540 100644 (file)
--- 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;
 }