Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitda1c0ac

Browse files
committed
pg_upgrade: Tweak translatable strings
"\r" (for progress output) must not be inside a translatable string(gettext gets upset).In passing, move the minimum supported version number to a separateargument, so that we don't have to retranslate this string every yearnow.
1 parent09ed73f commitda1c0ac

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

‎src/bin/pg_upgrade/check.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ check_cluster_versions(void)
289289
*/
290290

291291
if (GET_MAJOR_VERSION(old_cluster.major_version)<902)
292-
pg_fatal("This utility can only upgrade from PostgreSQL version 9.2 and later.\n");
292+
pg_fatal("This utility can only upgrade from PostgreSQL version %s and later.\n",
293+
"9.2");
293294

294295
/* Only current PG version is supported as a target */
295296
if (GET_MAJOR_VERSION(new_cluster.major_version)!=GET_MAJOR_VERSION(PG_VERSION_NUM))

‎src/bin/pg_upgrade/util.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ end_progress_output(void)
4747
* nicely.
4848
*/
4949
if (log_opts.isatty)
50-
pg_log(PG_REPORT,"\r%-*s",MESSAGE_WIDTH,"");
50+
{
51+
printf("\r");
52+
pg_log(PG_REPORT,"%-*s",MESSAGE_WIDTH,"");
53+
}
5154
elseif (log_opts.verbose)
5255
pg_log(PG_REPORT,"%-*s",MESSAGE_WIDTH,"");
5356
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp