projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 05883bd)
Make pg_upgrade log message with control file path translatable.
authorFujii Masao <fujii@postgresql.org>
Fri, 18 Apr 2025 09:35:40 +0000 (18:35 +0900)
committerFujii Masao <fujii@postgresql.org>
Fri, 18 Apr 2025 09:35:40 +0000 (18:35 +0900)
Commit 173c97812ff replaced the hardcoded "global/pg_control" in pg_upgrade
log message with a string literal concatenation of XLOG_CONTROL_FILE macro.
However, this change made the message untranslatable.

This commit fixes the issue by using %s with XLOG_CONTROL_FILE instead of
that literal concatenation, allowing the message to be translated properly.
It also wraps the file path in double quotes for consistency with similar
log messages.

Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Reviewed-by: Masao Fujii <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/20250407.155546.2129693791769531891.horikyota.ntt@gmail.com

src/bin/pg_upgrade/controldata.c patch | blob | blame | history

diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 8b7c349a87517d4df82373a0ef41ba37fb8f1ea4..90cef0864de7ca26feb9102756bfd85b4aa57b68 100644 (file)
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -758,7 +758,8 @@ disable_old_cluster(transferMode transfer_mode)
                new_path[MAXPGPATH];
 
    /* rename pg_control so old server cannot be accidentally started */
-   prep_status("Adding \".old\" suffix to old " XLOG_CONTROL_FILE);
+   /* translator: %s is the file path of the control file */
+   prep_status("Adding \".old\" suffix to old \"%s\"", XLOG_CONTROL_FILE);
 
    snprintf(old_path, sizeof(old_path), "%s/%s", old_cluster.pgdata, XLOG_CONTROL_FILE);
    snprintf(new_path, sizeof(new_path), "%s/%s.old", old_cluster.pgdata, XLOG_CONTROL_FILE);
@@ -768,9 +769,10 @@ disable_old_cluster(transferMode transfer_mode)
    check_ok();
 
    if (transfer_mode == TRANSFER_MODE_LINK)
+       /* translator: %s/%s is the file path of the control file */
        pg_log(PG_REPORT, "\n"
               "If you want to start the old cluster, you will need to remove\n"
-              "the \".old\" suffix from %s/%s.old.\n"
+              "the \".old\" suffix from \"%s/%s.old\".\n"
               "Because \"link\" mode was used, the old cluster cannot be safely\n"
               "started once the new cluster has been started.",
               old_cluster.pgdata, XLOG_CONTROL_FILE);
This is the main PostgreSQL git repository.