postgres.git / summary / log / commit / refs

commit    b44fc39fcecf58c1c93a322d71be2faee525853f
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Wed Mar 05 23:15:19 2014 +0000
First released in: 9.4.0

    pg_dump:  make argument combination error exit code consistent
    
    Per report from Pavel Golub


 src/bin/pg_dump/pg_dump.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index f5a6bbb723e..17bb846165f 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -563,10 +563,16 @@ main(int argc, char **argv)
 		dump_inserts = 1;
 
 	if (dataOnly && schemaOnly)
-		exit_horribly(NULL, "options -s/--schema-only and -a/--data-only cannot be used together\n");
+	{
+		write_msg(NULL, "options -s/--schema-only and -a/--data-only cannot be used together\n");
+		exit_nicely(1);
+	}
 
 	if (dataOnly && outputClean)
-		exit_horribly(NULL, "options -c/--clean and -a/--data-only cannot be used together\n");
+	{
+		write_msg(NULL, "options -c/--clean and -a/--data-only cannot be used together\n");
+		exit_nicely(1);
+	}
 
 	if (dump_inserts && oids)
 	{


[parent: f1ba94bcd971]