diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2018-05-21 10:01:49 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2018-05-21 10:01:49 -0400 |
| commit | 3ce7f72529f5829f73e18240740bafc939b650b5 (patch) | |
| tree | 25008a85fdf4a7fc1b85b1711b30005f8609234d /src | |
| parent | 81256cd05f0745353c6572362155b57250a0d2a0 (diff) | |
| download | postgresql-3ce7f72529f5829f73e18240740bafc939b650b5.tar.gz postgresql-3ce7f72529f5829f73e18240740bafc939b650b5.zip | |
pg_basebackup: Remove short option -k
-k meant --no-verify-checksums, which is the opposite of what initdb
uses -k for. After discussion, a short option does not seem necessary,
so just keep the long option.
Discussion: https://www.postgresql.org/message-id/flat/d510f8aa-19e1-d06e-7630-ad27f7441d68%402ndquadrant.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 10 | ||||
| -rw-r--r-- | src/bin/pg_basebackup/t/010_pg_basebackup.pl | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index fb5b51d6bea..ef4cfc43847 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -363,11 +363,11 @@ usage(void) printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n")); printf(_(" -P, --progress show progress information\n")); printf(_(" -S, --slot=SLOTNAME replication slot to use\n")); - printf(_(" --no-slot prevent creation of temporary replication slot\n")); - printf(_(" -k, --no-verify-checksums\n" - " do not verify checksums\n")); printf(_(" -v, --verbose output verbose messages\n")); printf(_(" -V, --version output version information, then exit\n")); + printf(_(" --no-slot prevent creation of temporary replication slot\n")); + printf(_(" --no-verify-checksums\n" + " do not verify checksums\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\nConnection options:\n")); printf(_(" -d, --dbname=CONNSTR connection string\n")); @@ -2159,7 +2159,7 @@ main(int argc, char **argv) {"progress", no_argument, NULL, 'P'}, {"waldir", required_argument, NULL, 1}, {"no-slot", no_argument, NULL, 2}, - {"no-verify-checksums", no_argument, NULL, 'k'}, + {"no-verify-checksums", no_argument, NULL, 3}, {NULL, 0, NULL, 0} }; int c; @@ -2328,7 +2328,7 @@ main(int argc, char **argv) case 'P': showprogress = true; break; - case 'k': + case 3: verify_checksums = false; break; default: diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 6b2e0286c47..aab2e1eecff 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -552,7 +552,7 @@ rmtree("$tempdir/backup_corrupt3"); # do not verify checksums, should return ok $node->command_ok( - [ 'pg_basebackup', '-D', "$tempdir/backup_corrupt4", '-k' ], + [ 'pg_basebackup', '-D', "$tempdir/backup_corrupt4", '--no-verify-checksums' ], 'pg_basebackup with -k does not report checksum mismatch'); rmtree("$tempdir/backup_corrupt4"); |