database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-15 02:22:24 +03:00
Code Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

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));
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);
}