diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/initdb/initdb.c | 8 | ||||
| -rw-r--r-- | src/bin/pg_ctl/pg_ctl.c | 3 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dumpall.c | 8 | ||||
| -rw-r--r-- | src/bin/pg_rewind/pg_rewind.c | 16 | ||||
| -rw-r--r-- | src/bin/pg_verifybackup/pg_verifybackup.c | 8 |
5 files changed, 21 insertions, 22 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index a6577486ce9..a66dd078a79 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -2431,15 +2431,15 @@ setup_bin_paths(const char *argv0) strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) - pg_log_error("The program \"postgres\" is needed by %s but was not found in the\n" + pg_log_error("The program \"%s\" is needed by %s but was not found in the\n" "same directory as \"%s\".\n" "Check your installation.", - progname, full_path); + "postgres", progname, full_path); else - pg_log_error("The program \"postgres\" was found by \"%s\"\n" + pg_log_error("The program \"%s\" was found by \"%s\"\n" "but was not the same version as %s.\n" "Check your installation.", - full_path, progname); + "postgres", full_path, progname); exit(1); } diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index f41084d2dba..3c03ace7ed6 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -810,8 +810,7 @@ find_other_exec_or_die(const char *argv0, const char *target, const char *versio strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) - write_stderr(_("The program \"%s\" is needed by %s " - "but was not found in the\n" + write_stderr(_("The program \"%s\" is needed by %s but was not found in the\n" "same directory as \"%s\".\n" "Check your installation.\n"), target, progname, full_path); diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 0b25526d48f..8d548491023 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -196,15 +196,15 @@ main(int argc, char *argv[]) strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) - pg_log_error("The program \"pg_dump\" is needed by %s but was not found in the\n" + pg_log_error("The program \"%s\" is needed by %s but was not found in the\n" "same directory as \"%s\".\n" "Check your installation.", - progname, full_path); + "pg_dump", progname, full_path); else - pg_log_error("The program \"pg_dump\" was found by \"%s\"\n" + pg_log_error("The program \"%s\" was found by \"%s\"\n" "but was not the same version as %s.\n" "Check your installation.", - full_path, progname); + "pg_dump", full_path, progname); exit_nicely(1); } diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c index ca9e50d4d0c..630fb3b9f56 100644 --- a/src/bin/pg_rewind/pg_rewind.c +++ b/src/bin/pg_rewind/pg_rewind.c @@ -847,15 +847,15 @@ getRestoreCommand(const char *argv0) strlcpy(full_path, progname, sizeof(full_path)); if (rc == -1) - pg_log_error("The program \"postgres\" is needed by %s but was not found in the\n" + pg_log_error("The program \"%s\" is needed by %s but was not found in the\n" "same directory as \"%s\".\n" "Check your installation.", - progname, full_path); + "postgres", progname, full_path); else - pg_log_error("The program \"postgres\" was found by \"%s\"\n" + pg_log_error("The program \"%s\" was found by \"%s\"\n" "but was not the same version as %s.\n" "Check your installation.", - full_path, progname); + "postgres", full_path, progname); exit(1); } @@ -905,13 +905,13 @@ ensureCleanShutdown(const char *argv0) strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) - pg_fatal("The program \"%s\" is needed by %s but was\n" - "not found in the same directory as \"%s\".\n" + pg_fatal("The program \"%s\" is needed by %s but was not found in the\n" + "same directory as \"%s\".\n" "Check your installation.", "postgres", progname, full_path); else - pg_fatal("The program \"%s\" was found by \"%s\" but was\n" - "not the same version as %s.\n" + pg_fatal("The program \"%s\" was found by \"%s\"\n" + "but was not the same version as %s.\n" "Check your installation.", "postgres", full_path, progname); } diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index a54130b3204..2fa2aa6ae04 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -295,13 +295,13 @@ main(int argc, char **argv) if (find_my_exec(argv[0], full_path) < 0) strlcpy(full_path, progname, sizeof(full_path)); if (ret == -1) - pg_log_fatal("The program \"%s\" is needed by %s but was\n" - "not found in the same directory as \"%s\".\n" + pg_log_fatal("The program \"%s\" is needed by %s but was not found in the\n" + "same directory as \"%s\".\n" "Check your installation.", "pg_waldump", "pg_verifybackup", full_path); else - pg_log_fatal("The program \"%s\" was found by \"%s\" but was\n" - "not the same version as %s.\n" + pg_log_fatal("The program \"%s\" was found by \"%s\"\n" + "but was not the same version as %s.\n" "Check your installation.", "pg_waldump", full_path, "pg_verifybackup"); } |