psql: Re-allow -1 together with -c or -l

petere · petere · commit c3c86ae2aff6 · 2013-06-17T21:53:33.000-04:00
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -162,12 +162,9 @@ main(int argc, char *argv[])
 	}
 
 	/* Bail out if -1 was specified but will be ignored. */
-	if (options.single_txn && options.action != ACT_FILE)
+	if (options.single_txn && options.action != ACT_FILE && options.action == ACT_NOTHING)
 	{
-		if (options.action == ACT_NOTHING)
-			fprintf(stderr, _("%s: -1 can only be used in non-interactive mode\n"), pset.progname);
-		else
-			fprintf(stderr, _("%s: -1 is incompatible with -c and -l\n"), pset.progname);
+		fprintf(stderr, _("%s: -1 can only be used in non-interactive mode\n"), pset.progname);
 		exit(EXIT_FAILURE);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -162,12 +162,9 @@ main(int argc, char *argv[])`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`/* Bail out if -1 was specified but will be ignored. */`
`165`		`- if (options.single_txn && options.action != ACT_FILE)`
	`165`	`+ if (options.single_txn && options.action != ACT_FILE && options.action == ACT_NOTHING)`
`166`	`166`	`{`
`167`		`- if (options.action == ACT_NOTHING)`
`168`		`- fprintf(stderr, _("%s: -1 can only be used in non-interactive mode\n"), pset.progname);`
`169`		`- else`
`170`		`- fprintf(stderr, _("%s: -1 is incompatible with -c and -l\n"), pset.progname);`
	`167`	`+ fprintf(stderr, _("%s: -1 can only be used in non-interactive mode\n"), pset.progname);`
`171`	`168`	`exit(EXIT_FAILURE);`
`172`	`169`	`}`
`173`	`170`