postgres.git / summary / log / commit / refs

commit    3e6f01fd7d9b01b17626a6bc38cf664354eede71
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Fri Jan 05 19:46:27 2018 +0000
First released in: 11.0, 10.2

    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;
 }


[parent: 959ee6d267fb]