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

bmomjian · bmomjian · commit e8969c4733b1 · 2012-08-03T12:43:37.000-04:00
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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ pg_log(eLogType type, char *fmt,...)`
`81`	`81`	`if (type != PG_VERBOSE \|\| log_opts.verbose)`
`82`	`82`	`{`
`83`	`83`	`fwrite(message, strlen(message), 1, log_opts.internal);`
`84`		`- /* if we are using OVERWRITE_MESSAGE, add newline */`
	`84`	`+ /* if we are using OVERWRITE_MESSAGE, add newline to log file */`
`85`	`85`	`if (strchr(message, '\r') != NULL)`
`86`	`86`	`fwrite("\n", 1, 1, log_opts.internal);`
`87`	`87`	`fflush(log_opts.internal);`