database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Unify find_other_exec() error messages

Browse Source 
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.
This commit is contained in:
Peter Eisentraut 2020-05-08 13:33:00 +02:00
parent 086ffddf36
commit 7666ef313d
5 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/initdb/initdb.c
View File

@ -2431,15 +2431,15 @@ setup_bin_paths(const char *argv0)
strlcpy(full_path, progname, sizeof(full_path)); strlcpy(full_path, progname, sizeof(full_path));
if (ret == -1) 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" "same directory as \"%s\".\n"
"Check your installation.", "Check your installation.",
progname, full_path); "postgres", progname, full_path);
else 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" "but was not the same version as %s.\n"
"Check your installation.", "Check your installation.",
full_path, progname); "postgres", full_path, progname);
exit(1); exit(1);
} }

3
src/bin/pg_ctl/pg_ctl.c
View File

@ -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)); strlcpy(full_path, progname, sizeof(full_path));
if (ret == -1) if (ret == -1)
write_stderr(_("The program \"%s\" is needed by %s " write_stderr(_("The program \"%s\" is needed by %s but was not found in the\n"
"but was not found in the\n"
"same directory as \"%s\".\n" "same directory as \"%s\".\n"
"Check your installation.\n"), "Check your installation.\n"),
target, progname, full_path); target, progname, full_path);

8
src/bin/pg_dump/pg_dumpall.c
View File

@ -196,15 +196,15 @@ main(int argc, char *argv[])
strlcpy(full_path, progname, sizeof(full_path)); strlcpy(full_path, progname, sizeof(full_path));
if (ret == -1) 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" "same directory as \"%s\".\n"
"Check your installation.", "Check your installation.",
progname, full_path); "pg_dump", progname, full_path);
else 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" "but was not the same version as %s.\n"
"Check your installation.", "Check your installation.",
full_path, progname); "pg_dump", full_path, progname);
exit_nicely(1); exit_nicely(1);
} }

16
src/bin/pg_rewind/pg_rewind.c
View File

@ -847,15 +847,15 @@ getRestoreCommand(const char *argv0)
strlcpy(full_path, progname, sizeof(full_path)); strlcpy(full_path, progname, sizeof(full_path));
if (rc == -1) 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" "same directory as \"%s\".\n"
"Check your installation.", "Check your installation.",
progname, full_path); "postgres", progname, full_path);
else 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" "but was not the same version as %s.\n"
"Check your installation.", "Check your installation.",
full_path, progname); "postgres", full_path, progname);
exit(1); exit(1);
} }
@ -905,13 +905,13 @@ ensureCleanShutdown(const char *argv0)
strlcpy(full_path, progname, sizeof(full_path)); strlcpy(full_path, progname, sizeof(full_path));
if (ret == -1) if (ret == -1)
pg_fatal("The program \"%s\" is needed by %s but was\n" pg_fatal("The program \"%s\" is needed by %s but was not found in the\n"
"not found in the same directory as \"%s\".\n" "same directory as \"%s\".\n"
"Check your installation.", "Check your installation.",
"postgres", progname, full_path); "postgres", progname, full_path);
else else
pg_fatal("The program \"%s\" was found by \"%s\" but was\n" pg_fatal("The program \"%s\" was found by \"%s\"\n"
"not the same version as %s.\n" "but was not the same version as %s.\n"
"Check your installation.", "Check your installation.",
"postgres", full_path, progname); "postgres", full_path, progname);
} }

8
src/bin/pg_verifybackup/pg_verifybackup.c
View File

@ -295,13 +295,13 @@ main(int argc, char **argv)
if (find_my_exec(argv[0], full_path) < 0) if (find_my_exec(argv[0], full_path) < 0)
strlcpy(full_path, progname, sizeof(full_path)); strlcpy(full_path, progname, sizeof(full_path));
if (ret == -1) if (ret == -1)
pg_log_fatal("The program \"%s\" is needed by %s but was\n" pg_log_fatal("The program \"%s\" is needed by %s but was not found in the\n"
"not found in the same directory as \"%s\".\n" "same directory as \"%s\".\n"
"Check your installation.", "Check your installation.",
"pg_waldump", "pg_verifybackup", full_path); "pg_waldump", "pg_verifybackup", full_path);
else else
pg_log_fatal("The program \"%s\" was found by \"%s\" but was\n" pg_log_fatal("The program \"%s\" was found by \"%s\"\n"
"not the same version as %s.\n" "but was not the same version as %s.\n"
"Check your installation.", "Check your installation.",
"pg_waldump", full_path, "pg_verifybackup"); "pg_waldump", full_path, "pg_verifybackup");
} }