From cac7297784a4eb953f0d6108d7e67e97be9285ad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 Sep 2016 12:57:42 -0400 Subject: 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. --- Command/MetaData.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Command/MetaData.hs') diff --git a/Command/MetaData.hs b/Command/MetaData.hs index e3cf921cb..bf71f7b4f 100644 --- a/Command/MetaData.hs +++ b/Command/MetaData.hs @@ -78,7 +78,7 @@ seek o = do (startKeys now o) (seeker $ whenAnnexed $ start now o) (forFiles o) - Batch -> withOutputType $ \ot -> case ot of + Batch -> withMessageState $ \s -> case outputType s of JSONOutput -> batchInput parseJSONInput $ commandAction . startBatch now _ -> error "--batch is currently only supported in --json mode" -- cgit v1.2.3