projects
/
postgresql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
275bf98
)
Don't allow both --source-server and --source-target args to pg_rewind.
author
Heikki Linnakangas
<
[email protected]
>
Fri, 7 Oct 2016 11:35:17 +0000
(14:35 +0300)
committer
Heikki Linnakangas
<
[email protected]
>
Fri, 7 Oct 2016 11:35:17 +0000
(14:35 +0300)
They are supposed to be mutually exclusive, but there was no check for
that.
Michael Banck
Discussion: <
20161007103414
[email protected]
>
src/bin/pg_rewind/pg_rewind.c
patch
|
blob
|
blame
|
history
diff --git
a/src/bin/pg_rewind/pg_rewind.c
b/src/bin/pg_rewind/pg_rewind.c
index 5fdd4c5605063ceb60b7f0a183d8f47c9a5904ad..dd62dd05491a5afda45aeebdb66cd52fceded221 100644
(file)
--- a/
src/bin/pg_rewind/pg_rewind.c
+++ b/
src/bin/pg_rewind/pg_rewind.c
@@
-162,6
+162,13
@@
main(int argc, char **argv)
exit(1);
}
+ if (datadir_source != NULL && connstr_source != NULL)
+ {
+ fprintf(stderr, _("%s: only one of --source-pgdata or --source-server can be specified\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+ exit(1);
+ }
+
if (datadir_target == NULL)
{
fprintf(stderr, _("%s: no target data directory specified (--target-pgdata)\n"), progname);