From: Peter Eisentraut <peter@eisentraut.org>
Date: Thu, 7 Aug 2025 22:27:14 +0000 (+0200)
Subject: pg_upgrade: Make format strings consistent
X-Git-Tag: REL_16_10~12
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=06f44481646a669b43a19a2c501a164459d194f1;p=postgresql.git

pg_upgrade: Make format strings consistent

The backport of commit f295494d338 introduced a format string using
%m.  This is not wrong, since those have been supported since commit
d6c55de1f99a, but only commit 2c8118ee5d9 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
index 73f361a1b4b..f3bd6a2102f 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -1152,7 +1152,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);