public inbox for [email protected]
help / color / mirror / Atom feed[PATCH 03/18] pg_restore: "must be specified" and --list
4+ messages / 4 participants
[nested] [flat]
* [PATCH 03/18] pg_restore: "must be specified" and --list
@ 2020-12-06 04:43 Justin Pryzby <[email protected]>
0 siblings, 0 replies; 4+ messages in thread
From: Justin Pryzby @ 2020-12-06 04:43 UTC (permalink / raw)
This was discussed here, but the idea got lost.
https://www.postgresql.org/message-id/flat/20190612170201.GA11881%40alvherre.pgsql#2984347ab074e6f19...
---
src/bin/pg_dump/pg_restore.c | 2 +-
src/bin/pg_dump/t/001_basic.pl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 589b4aed53..f6e6e41329 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -305,7 +305,7 @@ main(int argc, char **argv)
/* Complain if neither -f nor -d was specified (except if dumping TOC) */
if (!opts->cparams.dbname && !opts->filename && !opts->tocSummary)
{
- pg_log_error("one of -d/--dbname and -f/--file must be specified");
+ pg_log_error("one of -d/--dbname, -f/--file, or -l/--list must be specified");
exit_nicely(1);
}
diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index 083fb3ad08..8280914c2a 100644
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -63,8 +63,8 @@ command_fails_like(
command_fails_like(
['pg_restore'],
- qr{\Qpg_restore: error: one of -d/--dbname and -f/--file must be specified\E},
- 'pg_restore: error: one of -d/--dbname and -f/--file must be specified');
+ qr{\Qpg_restore: error: one of -d/--dbname, -f/--file, or -l/--list must be specified\E},
+ 'pg_restore: error: one of -d/--dbname, -f/--file, or -l/--list must be specified');
command_fails_like(
[ 'pg_restore', '-s', '-a', '-f -' ],
--
2.17.0
--lc9FT7cWel8HagAv
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0004-typos-in-master.patch"
^ permalink raw reply [nested|flat] 4+ messages in thread
* Missing reflection in nls.mk from recent basebackup changes
@ 2024-08-06 01:21 Kyotaro Horiguchi <[email protected]>
2024-08-06 01:39 ` Re: Missing reflection in nls.mk from recent basebackup changes Michael Paquier <[email protected]>
0 siblings, 1 reply; 4+ messages in thread
From: Kyotaro Horiguchi @ 2024-08-06 01:21 UTC (permalink / raw)
To: [email protected]
Hello.
After a recent commit f80b09bac8, make update-po fails with "missing
required files". The commit moved some files to fe_utils but this
change was not reflected in pg_basebackup's nls.mk. The attached patch
fixes this issue.
regards.
--
Kyotaro Horiguchi
NTT Open Source Software Center
Attachments:
[text/x-patch] 0001-Fix-nls.mk-to-reflect-astreamer-files-relocation.patch (1.8K, ../../[email protected]/2-0001-Fix-nls.mk-to-reflect-astreamer-files-relocation.patch)
download | inline diff:
From f9eac9605d0309d32d6d1fab7a0a2d4e8d42798a Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <[email protected]>
Date: Tue, 6 Aug 2024 10:04:54 +0900
Subject: [PATCH] Fix nls.mk to reflect astreamer files relocation
In the recent commit f80b09bac8, astreamer files were moved to another
directory, but this change was not reflected in nls.mk. This commit
corrects that oversight.
---
src/bin/pg_basebackup/nls.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
index 950b9797b1..f75f44dbe6 100644
--- a/src/bin/pg_basebackup/nls.mk
+++ b/src/bin/pg_basebackup/nls.mk
@@ -1,12 +1,7 @@
# src/bin/pg_basebackup/nls.mk
CATALOG_NAME = pg_basebackup
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
- astreamer_file.c \
- astreamer_gzip.c \
astreamer_inject.c \
- astreamer_lz4.c \
- astreamer_tar.c \
- astreamer_zstd.c \
pg_basebackup.c \
pg_createsubscriber.c \
pg_receivewal.c \
@@ -19,6 +14,11 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
../../common/fe_memutils.c \
../../common/file_utils.c \
../../common/restricted_token.c \
+ ../../fe_utils/astreamer_file.c \
+ ../../fe_utils/astreamer_gzip.c \
+ ../../fe_utils/astreamer_lz4.c \
+ ../../fe_utils/astreamer_tar.c \
+ ../../fe_utils/astreamer_zstd.c \
../../fe_utils/option_utils.c \
../../fe_utils/recovery_gen.c \
../../fe_utils/string_utils.c
--
2.43.5
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Missing reflection in nls.mk from recent basebackup changes
2024-08-06 01:21 Missing reflection in nls.mk from recent basebackup changes Kyotaro Horiguchi <[email protected]>
@ 2024-08-06 01:39 ` Michael Paquier <[email protected]>
2024-08-12 22:54 ` Re: Missing reflection in nls.mk from recent basebackup changes Alvaro Herrera <[email protected]>
0 siblings, 1 reply; 4+ messages in thread
From: Michael Paquier @ 2024-08-06 01:39 UTC (permalink / raw)
To: Kyotaro Horiguchi <[email protected]>; +Cc: [email protected]
On Tue, Aug 06, 2024 at 10:21:23AM +0900, Kyotaro Horiguchi wrote:
> After a recent commit f80b09bac8, make update-po fails with "missing
> required files". The commit moved some files to fe_utils but this
> change was not reflected in pg_basebackup's nls.mk. The attached patch
> fixes this issue.
You are right. Still, it is not something that committers are
required to update when introducing new files, isn't it? I don't see
why we should be aggressive here for HEAD.
ad8877cb5137 has done a large batch of these for the v17 cycle.
--
Michael
Attachments:
[application/pgp-signature] signature.asc (833B, ../../[email protected]/2-signature.asc)
download
^ permalink raw reply [nested|flat] 4+ messages in thread
* Re: Missing reflection in nls.mk from recent basebackup changes
2024-08-06 01:21 Missing reflection in nls.mk from recent basebackup changes Kyotaro Horiguchi <[email protected]>
2024-08-06 01:39 ` Re: Missing reflection in nls.mk from recent basebackup changes Michael Paquier <[email protected]>
@ 2024-08-12 22:54 ` Alvaro Herrera <[email protected]>
0 siblings, 0 replies; 4+ messages in thread
From: Alvaro Herrera @ 2024-08-12 22:54 UTC (permalink / raw)
To: Michael Paquier <[email protected]>; +Cc: Kyotaro Horiguchi <[email protected]>; [email protected]
On 2024-Aug-06, Michael Paquier wrote:
> On Tue, Aug 06, 2024 at 10:21:23AM +0900, Kyotaro Horiguchi wrote:
> > After a recent commit f80b09bac8, make update-po fails with "missing
> > required files". The commit moved some files to fe_utils but this
> > change was not reflected in pg_basebackup's nls.mk. The attached patch
> > fixes this issue.
>
> You are right. Still, it is not something that committers are
> required to update when introducing new files, isn't it? I don't see
> why we should be aggressive here for HEAD.
Well, make targets should always work.
> ad8877cb5137 has done a large batch of these for the v17 cycle.
IIUC that's slightly different -- it concerns files that contain
*additional* files that msgmerge need to scan in order to extract
translatable strings. This patch is about fixing bogus file locations
in the makefiles. So without this patch, update-po fails; without the
commit you mention, update-po continues to run, the only problem is it
misses a few files.
--
Álvaro Herrera PostgreSQL Developer — https://www.EnterpriseDB.com/
"El sentido de las cosas no viene de las cosas, sino de
las inteligencias que las aplican a sus problemas diarios
en busca del progreso." (Ernesto Hernández-Novich)
^ permalink raw reply [nested|flat] 4+ messages in thread
end of thread, other threads:[~2024-08-12 22:54 UTC | newest]
Thread overview: 4+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2020-12-06 04:43 [PATCH 03/18] pg_restore: "must be specified" and --list Justin Pryzby <[email protected]>
2024-08-06 01:21 Missing reflection in nls.mk from recent basebackup changes Kyotaro Horiguchi <[email protected]>
2024-08-06 01:39 ` Re: Missing reflection in nls.mk from recent basebackup changes Michael Paquier <[email protected]>
2024-08-12 22:54 ` Re: Missing reflection in nls.mk from recent basebackup changes Alvaro Herrera <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox