pg_basebackup has an accidentaly separated help message
Hello.
pg_basebackup.c: got the following message lines:
printf(_(" -i, --incremental=OLDMANIFEST\n"));
printf(_(" take incremental backup\n"));
I'd suggest merging these lines as follows (and the attached patch).
+ printf(_(" -i, --incremental=OLDMANIFEST\n" + " take incremental backup\n"));
regards.
--
Kyotaro Horiguchi
NTT Open Source Software Center
Attachments:
pg_basebackup_merge_help.difftext/x-patch; charset=us-asciiDownload
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 5795b91261..28d2ee435b 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -396,8 +396,8 @@ usage(void)
printf(_("\nOptions controlling the output:\n"));
printf(_(" -D, --pgdata=DIRECTORY receive base backup into directory\n"));
printf(_(" -F, --format=p|t output format (plain (default), tar)\n"));
- printf(_(" -i, --incremental=OLDMANIFEST\n"));
- printf(_(" take incremental backup\n"));
+ printf(_(" -i, --incremental=OLDMANIFEST\n"
+ " take incremental backup\n"));
printf(_(" -r, --max-rate=RATE maximum transfer rate to transfer data directory\n"
" (in kB/s, or use suffix \"k\" or \"M\")\n"));
printf(_(" -R, --write-recovery-conf\n"
printf(_(" -i, --incremental=OLDMANIFEST\n"));
printf(_(" take incremental backup\n"));I'd suggest merging these lines as follows (and the attached patch).
+ printf(_(" -i, --incremental=OLDMANIFEST\n" + " take incremental backup\n"));
Sorry, but I found another instance of this.
printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"));
printf(_(" relocate tablespace in OLDDIR to NEWDIR\n"));
The attached patch contains both of the above fixes.
regards.
--
Kyotaro Horiguchi
NTT Open Source Software Center
Attachments:
pg_basebackup_merge_help.difftext/x-patch; charset=us-asciiDownload
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 5795b91261..28d2ee435b 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -396,8 +396,8 @@ usage(void)
printf(_("\nOptions controlling the output:\n"));
printf(_(" -D, --pgdata=DIRECTORY receive base backup into directory\n"));
printf(_(" -F, --format=p|t output format (plain (default), tar)\n"));
- printf(_(" -i, --incremental=OLDMANIFEST\n"));
- printf(_(" take incremental backup\n"));
+ printf(_(" -i, --incremental=OLDMANIFEST\n"
+ " take incremental backup\n"));
printf(_(" -r, --max-rate=RATE maximum transfer rate to transfer data directory\n"
" (in kB/s, or use suffix \"k\" or \"M\")\n"));
printf(_(" -R, --write-recovery-conf\n"
diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c
index b6ae6f2aef..49e97fcca8 100644
--- a/src/bin/pg_combinebackup/pg_combinebackup.c
+++ b/src/bin/pg_combinebackup/pg_combinebackup.c
@@ -669,8 +669,8 @@ help(const char *progname)
printf(_(" -n, --dry-run don't actually do anything\n"));
printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n"));
printf(_(" -o, --output output directory\n"));
- printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"));
- printf(_(" relocate tablespace in OLDDIR to NEWDIR\n"));
+ printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
+ " relocate tablespace in OLDDIR to NEWDIR\n"));
printf(_(" --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
" use algorithm for manifest checksums\n"));
printf(_(" --no-manifest suppress generation of backup manifest\n"));
On Mon, Dec 25, 2023 at 02:39:16PM +0900, Kyotaro Horiguchi wrote:
The attached patch contains both of the above fixes.
Good catches, let's fix them. You have noticed that while translating
these new messages, I guess?
--
Michael
At Mon, 25 Dec 2023 15:42:41 +0900, Michael Paquier <michael@paquier.xyz> wrote in
On Mon, Dec 25, 2023 at 02:39:16PM +0900, Kyotaro Horiguchi wrote:
The attached patch contains both of the above fixes.
Good catches, let's fix them. You have noticed that while translating
these new messages, I guess?
Yes. So, it turns out that they're found after they have been
committed.
Because handling a large volume of translations all at once is
daunting, I am maintaining translations locally to avoid that.
regards.
--
Kyotaro Horiguchi
NTT Open Source Software Center
On Mon, Dec 25, 2023 at 05:07:28PM +0900, Kyotaro Horiguchi wrote:
Yes. So, it turns out that they're found after they have been
committed.
No problem. I've just applied what you had. I hope this makes your
life a bit easier ;)
--
Michael
At Tue, 26 Dec 2023 19:04:53 +0900, Michael Paquier <michael@paquier.xyz> wrote in
On Mon, Dec 25, 2023 at 05:07:28PM +0900, Kyotaro Horiguchi wrote:
Yes. So, it turns out that they're found after they have been
committed.No problem. I've just applied what you had. I hope this makes your
life a bit easier ;)
Thanks for committing this!
regards.
--
Kyotaro Horiguchi
NTT Open Source Software Center