pg_upgrade: Make format strings consistent

petere · petere · commit ed2bb0cdda77 · 2025-08-08T00:29:31.000+02:00
The backport of commit f295494 introduced a format string using %m. This is not wrong, since those have been supported since commit d6c55de, but only commit 2c8118e later introduced their use in this file. This use introduces a gratuitously different translatable string and also makes it inconsistent with the rest of the file. To avoid that, switch this back to the old-style strerror() route in the appropriate backbranches
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
@@ -1255,7 +1255,7 @@ check_for_not_null_inheritance(ClusterInfo *cluster)
 		for (int i = 0; i < ntup; i++)
 		{
 			if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
-				pg_fatal("could not open file \"%s\": %m", output_path);
+				pg_fatal("could not open file \"%s\": %s", output_path, strerror(errno));
 			if (!db_used)
 			{
 				fprintf(script, "In database: %s\n", active_db->db_name);

Original file line number	Diff line number	Diff line change
`@@ -1255,7 +1255,7 @@ check_for_not_null_inheritance(ClusterInfo *cluster)`
`1255`	`1255`	`for (int i = 0; i < ntup; i++)`
`1256`	`1256`	`{`
`1257`	`1257`	`if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)`
`1258`		`- pg_fatal("could not open file \"%s\": %m", output_path);`
	`1258`	`+ pg_fatal("could not open file \"%s\": %s", output_path, strerror(errno));`
`1259`	`1259`	`if (!db_used)`
`1260`	`1260`	`{`
`1261`	`1261`	`fprintf(script, "In database: %s\n", active_db->db_name);`