database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

pg_upgrade: revert part of patch for ease of translation

Browse Source 
Revert part of 959ee6d267 .

Backpatch-through: 10
This commit is contained in:
Bruce Momjian
2018-01-05 14:46:26 -05:00
parent b3b058539c
commit 5f45c72e3e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/pg_upgrade/server.c
View File

@ -310,8 +310,13 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
* running. * running.
*/ */
if (!pg_ctl_return) if (!pg_ctl_return)
pg_fatal("pg_ctl failed to start the %s server, or connection failed\n", {
cluster == &old_cluster ? "source" : "target"); /* keep error strings separate to ease translation */
if (cluster == &old_cluster)
pg_fatal("pg_ctl failed to start the source server, or connection failed\n");
else
pg_fatal("pg_ctl failed to start the target server, or connection failed\n");
}
return true; return true;
} }