diff options
| author | Bruce Momjian <bruce@momjian.us> | 2018-01-05 14:11:15 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2018-01-05 14:11:15 -0500 |
| commit | b3b058539c27c36a1b28c268e9179660ef0b0293 (patch) | |
| tree | 208c9666ba8c293dfe3f6922f7b3e191c76c280e /src/bin/pg_upgrade/server.c | |
| parent | a19c262f3a013065429462c7a322eebf3f7e3771 (diff) | |
| download | postgresql-b3b058539c27c36a1b28c268e9179660ef0b0293.tar.gz postgresql-b3b058539c27c36a1b28c268e9179660ef0b0293.zip | |
pg_upgrade: simplify code layout in a few places
Backpatch-through: 9.4 (9.3 didn't need improving)
Diffstat (limited to 'src/bin/pg_upgrade/server.c')
| -rw-r--r-- | src/bin/pg_upgrade/server.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index a91f18916c7..a123699d24c 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -310,12 +310,8 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) * running. */ if (!pg_ctl_return) - { - 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"); - } + pg_fatal("pg_ctl failed to start the %s server, or connection failed\n", + cluster == &old_cluster ? "source" : "target"); return true; } |