pg_upgrade: report failed cluster name

bmomjian · bmomjian · commit bd6aca8a7713 · 2013-01-24T08:35:57.000-05:00
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
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`477`	`477`	`!got_date_is_int \|\| !got_float8_pass_by_value)`
`478`	`478`	`{`
`479`	`479`	`pg_log(PG_REPORT,`
`480`		`- "Some required control information is missing; cannot find:\n");`
	`480`	`+ "The %s cluster lacks some required control information:\n",`
	`481`	`+ CLUSTER_NAME(cluster));`
`481`	`482`
`482`	`483`	`if (!got_xid)`
`483`	`484`	`pg_log(PG_REPORT, " checkpoint next XID\n");`