diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-09 12:57:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-09 12:57:42 -0400 |
| commit | cac7297784a4eb953f0d6108d7e67e97be9285ad (patch) | |
| tree | ca0098b875209945e15de2f63f52463487eb5e43 /CmdLine/GitAnnex | |
| parent | 70ad04b5fc21d39bdae85b08ec948359a28021e6 (diff) | |
disentangle concurrency and message type
This makes -Jn work with --json and --quiet, where before
setting -Jn disabled those options.
Concurrent json output is currently a mess though since threads output
chunks over top of one-another.
Diffstat (limited to 'CmdLine/GitAnnex')
| -rw-r--r-- | CmdLine/GitAnnex/Options.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index 64f70d178..1c360de19 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -21,6 +21,7 @@ import Types.Messages import Types.Command import Types.DeferredParse import Types.DesktopNotify +import Types.Concurrency import qualified Annex import qualified Remote import qualified Limit @@ -302,7 +303,7 @@ jobsOption = globalSetter set $ ) where set n = do - Annex.changeState $ \s -> s { Annex.concurrentjobs = Just n } + Annex.changeState $ \s -> s { Annex.concurrency = Concurrent n } c <- liftIO getNumCapabilities when (n > c) $ liftIO $ setNumCapabilities n |