In pg_upgrade, use pg_log() instead of prep_status() for

newline-terminated messages, per suggestion from Tom.

Backpatch to 9.2.

diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index 7688914079f8a541a77a519546673fbf47ea7e30..33a867f0d026a8cd4efc0ba0c50af1bed09970e3 100644 (file)
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -36,7 +36,7 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr,
                                new_dbnum;
        const char *msg = NULL;
 
-       prep_status("%s user relation files\n",
+       pg_log(PG_REPORT, "%s user relation files\n",
          user_opts.transfer_mode == TRANSFER_MODE_LINK ? "Linking" : "Copying");
 
        /* Scan the old cluster databases and transfer their files */

diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
index 76cd20b23d70869cafa77c1036f559a5d9b1d107..1c7120471f88580dff59d11cffad7934741c3493 100644 (file)
--- a/contrib/pg_upgrade/util.c
+++ b/contrib/pg_upgrade/util.c
@@ -81,7 +81,7 @@ pg_log(eLogType type, char *fmt,...)
        if (type != PG_VERBOSE || log_opts.verbose)
        {
                fwrite(message, strlen(message), 1, log_opts.internal);
-               /* if we are using OVERWRITE_MESSAGE, add newline */
+               /* if we are using OVERWRITE_MESSAGE, add newline to log file */
                if (strchr(message, '\r') != NULL)
                        fwrite("\n", 1, 1, log_opts.internal);
                fflush(log_opts.internal);