pg_upgrade: revert part of patch for ease of translation

bmomjian · bmomjian · commit 3e6f01fd7d9b · 2018-01-05T14:46:27.000-05:00
Revert part of 959ee6d . Backpatch-through: 10
diff --git 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;
 }
