Include error code in message from pg_upgrade

In passing, also quote the filename in one message where it wasn't.

Author: Dagfinn Ilmari Mannsåker
Discussion: https://postgr.es/m/87pne2w98h.fsf@wibble.ilmari.org

diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index e244256501312576a8ae61d3145aab1e938e671f..be604d33514cf346debfd7d6f07444db55e30ac3 100644 (file)
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -164,11 +164,11 @@ get_major_server_version(ClusterInfo *cluster)
        snprintf(ver_filename, sizeof(ver_filename), "%s/PG_VERSION",
                         cluster->pgdata);
        if ((version_fd = fopen(ver_filename, "r")) == NULL)
-               pg_fatal("could not open version file: %s\n", ver_filename);
+               pg_fatal("could not open version file \"%s\": %m\n", ver_filename);
 
        if (fscanf(version_fd, "%63s", cluster->major_version_str) == 0 ||
                sscanf(cluster->major_version_str, "%d.%d", &v1, &v2) < 1)
-               pg_fatal("could not parse PG_VERSION file from %s\n", cluster->pgdata);
+               pg_fatal("could not parse PG_VERSION file from \"%s\"\n", cluster->pgdata);
 
        fclose(version_fd);