diff options
| author | Fujii Masao <fujii@postgresql.org> | 2020-04-15 11:15:12 +0900 |
|---|---|---|
| committer | Fujii Masao <fujii@postgresql.org> | 2020-04-15 11:15:12 +0900 |
| commit | a2ac73e7be7adf2a9248d14322d3a5e055ea4fd0 (patch) | |
| tree | 4d36fe015fdf3b66f8f3ec223811f1ca5087ca58 /src | |
| parent | 4a05a6409567719829ec84d7689b41c55009d75f (diff) | |
| download | postgresql-a2ac73e7be7adf2a9248d14322d3a5e055ea4fd0.tar.gz postgresql-a2ac73e7be7adf2a9248d14322d3a5e055ea4fd0.zip | |
Code review for backup manifest.
This commit prevents pg_basebackup from receiving backup_manifest file
when --no-manifest is specified. Previously, when pg_basebackup was
writing a tarfile to stdout, it tried to receive backup_manifest file even
when --no-manifest was specified, and reported an error.
Also remove unused -m option from pg_basebackup.
Also fix typo in BASE_BACKUP command documentation.
Author: Fujii Masao
Reviewed-by: Michael Paquier, Robert Haas
Discussion: https://postgr.es/m/01e3ed3a-8729-5aaa-ca84-e60e3ca59db8@oss.nttdata.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index de098b3558c..65ca1b16f0c 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -1211,7 +1211,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum) * we're writing a tarfile to stdout, we don't have that option, so * include it in the one tarfile we've got. */ - if (strcmp(basedir, "-") == 0) + if (strcmp(basedir, "-") == 0 && manifest) { char header[512]; PQExpBufferData buf; @@ -2271,7 +2271,7 @@ main(int argc, char **argv) atexit(cleanup_directories_atexit); - while ((c = getopt_long(argc, argv, "CD:F:r:RS:T:X:l:nNzZ:d:c:h:p:U:s:wWkvPm:", + while ((c = getopt_long(argc, argv, "CD:F:r:RS:T:X:l:nNzZ:d:c:h:p:U:s:wWkvP", long_options, &option_index)) != -1) { switch (c) |