Unify find_other_exec() error messages

There were a few different ways to line-wrap the error messages.  Make
them all the same, and use placeholders for the actual program names,
to save translation work.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index a6577486ce9a4e8253423096b8bb1538e295e2a9..a66dd078a79e21de9f7265d35283224af3de81c2 100644 (file)
--- 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 f41084d2dba1aafbcd79d6d9c293057df4961082..3c03ace7ed6ba3b328001775d0756c9365023d9d 100644 (file)
--- 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 0b25526d48f872cbef37991c5df37f43f0eee563..8d548491023179bef4c2847b3a6c2e6c324818bc 100644 (file)
--- 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 ca9e50d4d0c9e11959181ca7406b823232d0f36d..630fb3b9f56bc32585a7cf83e31568b9c6b5e2f6 100644 (file)
--- 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 a54130b320477854546445ae25a765bf1630eef9..2fa2aa6ae04dc849d8e5b40c1080d2bf9e721072 100644 (file)
--- 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");
                }