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

This commit is contained in:
Peter Eisentraut 2013-06-17 21:53:33 -04:00
parent 20723ce801
commit 7558c1c00a

View File

@ -162,12 +162,9 @@ main(int argc, char *argv[])
} }
/* Bail out if -1 was specified but will be ignored. */ /* 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);
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);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }