Commitc3c86ae

committed

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

1 parentb8fd1a0 commitc3c86aeCopy full SHA for c3c86ae

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

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`

Comments

(0)