git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c

index 53802af896b9c5562344d326b828bacce6c5cdbf..71fb94578ed1b0a06eccc4d3cc143674524669b7 100644 (file)

--- a/src/bin/pg_basebackup/pg_receivexlog.c

+++ b/src/bin/pg_basebackup/pg_receivexlog.c

exit(1);

}

- if (replication_slot == NULL && (do_drop_slot || do_create_slot))

+ if (do_drop_slot && do_create_slot)

{

- fprintf(stderr, _("%s: --create-slot and --drop-slot need a slot to be specified using --slot\n"), progname);

+ fprintf(stderr, _("%s: cannot use --create-slot together with --drop-slot\n"), progname);

fprintf(stderr, _("Try \"%s --help\" for more information.\n"),

progname);

exit(1);

}

- if (do_drop_slot && do_create_slot)

+ if (replication_slot == NULL && (do_drop_slot || do_create_slot))

{

- fprintf(stderr, _("%s: cannot use --create-slot together with --drop-slot\n"), progname);

+ /* translator: second %s is an option name */

+ fprintf(stderr, _("%s: %s needs a slot to be specified using --slot\n"), progname,

+ do_drop_slot ? "--drop-slot" : "--create-slot");

fprintf(stderr, _("Try \"%s --help\" for more information.\n"),

progname);

exit(1);

diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c

index e4e16d7dc18c16b87e9a01bdd59119dbd13d58f2..0bc141dd79bc0e4be391a8df9cce63a136232a68 100644 (file)

--- a/src/bin/pg_basebackup/pg_recvlogical.c

+++ b/src/bin/pg_basebackup/pg_recvlogical.c

if (db_name == NULL)

{

fprintf(stderr,

- _("%s: failed to establish database specific replication connection\n"),

+ _("%s: could not establish database-specific replication connection\n"),

progname);

disconnect_and_exit(1);

}

diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c

index fee154904a61e4f9068b2f18a92482d4f774f05d..0cc5e8d33db4115f4f6321002d740eed2786d3da 100644 (file)

--- a/src/interfaces/libpq/fe-secure-openssl.c

+++ b/src/interfaces/libpq/fe-secure-openssl.c

else

{

printfPQExpBuffer(&conn->errorMessage,

- libpq_gettext("could not get server's hostname from server certificate\n"));

+ libpq_gettext("could not get server's hostname from server certificate\n"));

}

}