Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6802942

Browse files
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 parent375aa3f commit6802942

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎src/bin/pg_upgrade/server.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ get_major_server_version(ClusterInfo *cluster)
165165
snprintf(ver_filename,sizeof(ver_filename),"%s/PG_VERSION",
166166
cluster->pgdata);
167167
if ((version_fd=fopen(ver_filename,"r"))==NULL)
168-
pg_fatal("could not open version file: %s\n",ver_filename);
168+
pg_fatal("could not open version file \"%s\"\n",ver_filename);
169169

170170
if (fscanf(version_fd,"%63s",cluster->major_version_str)==0||
171171
sscanf(cluster->major_version_str,"%d.%d",&v1,&v2)<1)
172-
pg_fatal("could not parsePG_VERSION filefrom%s\n",cluster->pgdata);
172+
pg_fatal("could not parseversion file\"%s\"\n",ver_filename);
173173

174174
fclose(version_fd);
175175

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp