From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 24 Jan 2013 13:35:57 +0000 (-0500)
Subject: pg_upgrade:  report failed cluster name
X-Git-Tag: REL9_3_BETA1~445
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd6aca8a7713ecc0bed94dfb081bf24eda0c1f55;p=postgresql

pg_upgrade:  report failed cluster name

When pg_upgrade can't find required pg_controldata information, report
_which_ cluster is failing, with this message:

	The %s cluster lacks some required control information:
---

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 7c80c87315..f4252af4ed 100644
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -477,7 +477,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 		!got_date_is_int || !got_float8_pass_by_value)
 	{
 		pg_log(PG_REPORT,
-			"Some required control information is missing;  cannot find:\n");
+			"The %s cluster lacks some required control information:\n",
+			CLUSTER_NAME(cluster));
 
 		if (!got_xid)
 			pg_log(PG_REPORT, "  checkpoint next XID\n");