diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-05 15:32:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-05 15:34:38 -0400 |
| commit | 1a5415ba53e2c231eef4801a928a175ca7fe4c1f (patch) | |
| tree | d29e09a3356201c8e9f21c7fd164157188859523 /CmdLine.hs | |
| parent | 31f118f51dc3a8a32c0257209544dfb50542f696 (diff) | |
Make --json and --quiet suppress automatic init messages
And any other messages that might be output before a command starts.
Fixes a reversion introduced in version 5.20150727.
During the optparse-applicative conversion, I needed a place to run
per-command global option setters, and I made it get run during the seek stage. But
that is too late to have --json and --quiet disable output produced in the
check stage. Fix is just to run those per-command global option setters at
the same time as the all-command global option setters.
This commit was sponsored by Thom May.
Diffstat (limited to 'CmdLine.hs')
| -rw-r--r-- | CmdLine.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine.hs b/CmdLine.hs index 1c9ee7f90..c9de90ec0 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -99,7 +99,7 @@ parseCmd progname progdesc globaloptions allargs allcmds getparser = mkparser c = (,,) <$> pure c <*> getparser c - <*> combineGlobalOptions globaloptions + <*> combineGlobalOptions (globaloptions ++ cmdglobaloptions c) synopsis n d = n ++ " - " ++ d intro = mconcat $ concatMap (\l -> [H.text l, H.line]) (synopsis progname progdesc : commandList allcmds) |