NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2247a1e

committed

pg_upgrade: make get_major_server_version() err msg consistent

This patch fixes the error message in get_major_server_version() to be"could not parse version file", and uses the full file path name, ratherthan just the data directory path.Also, commit4109bb5 added the cause of the failure to the "couldnot open" error message, and improved quoting. This patch backpatchesthe "could not open" cause to PG 12, where it was first widely used, andbackpatches the quoting fix in that patch to all supported releases.Reported-by: Tom LaneDiscussion:https://postgr.es/m/87pne2w98h.fsf@wibble.ilmari.orgAuthor: Dagfinn Ilmari MannsåkerBackpatch-through: 9.5

1 parent4545282 commit2247a1eCopy full SHA for 2247a1e

File tree

1 file changed

-1

lines changed

src/bin/pg_upgrade
- server.c

1 file changed

-1

lines changed

`‎src/bin/pg_upgrade/server.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ get_major_server_version(ClusterInfo *cluster)`
`168`	`168`
`169`	`169`	`if (fscanf(version_fd,"%63s",cluster->major_version_str)==0\|\|`
`170`	`170`	`sscanf(cluster->major_version_str,"%d.%d",&v1,&v2)<1)`
`171`		`-pg_fatal("could not parsePG_VERSION filefrom\"%s\"\n",cluster->pgdata);`
	`171`	`+pg_fatal("could not parseversion file \"%s\"\n",ver_filename);`
`172`	`172`
`173`	`173`	`fclose(version_fd);`
`174`	`174`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2247a1e

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/server.c`

0 commit comments