From b9c249d46e582bf52b771368cfe9d8d455c11f9f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Feb 2016 15:02:42 -0400 Subject: Work around problem with concurrent-output when in a non-unicode locale by avoiding use of it in such a locale. Instead -J will behave as if it was built without concurrent-output support in this situation. Ie, it will be mostly quiet, except when there's an error. Note that it's not a problem for a filename to contain invalid utf-8 when in a utf-8 locale. That is handled ok by concurrent-output. It's only displaying unicode characters in a non-unicode locale that doesn't work. --- Messages.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Messages.hs') diff --git a/Messages.hs b/Messages.hs index cec0cb8a3..8d8f916ce 100644 --- a/Messages.hs +++ b/Messages.hs @@ -212,7 +212,7 @@ commandProgressDisabled = withOutputType $ \t -> return $ case t of QuietOutput -> True JSONOutput -> True NormalOutput -> False - ConcurrentOutput _ -> True + ConcurrentOutput {} -> True {- Use to show a message that is displayed implicitly, and so might be - disabled when running a certian command that needs more control over its -- cgit v1.2.3