aboutsummaryrefslogtreecommitdiff
path: root/Types
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-14 15:02:42 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-14 15:02:42 -0400
commitb9c249d46e582bf52b771368cfe9d8d455c11f9f (patch)
treed80ac8add3a7c560a8ec8cb148d6e1ae2effbe9e /Types
parentcc13dd82c5cd7647f911ed6be1e58694f7edee31 (diff)
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.
Diffstat (limited to 'Types')
-rw-r--r--Types/Messages.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Types/Messages.hs b/Types/Messages.hs
index f9e09ecd7..20c8051a0 100644
--- a/Types/Messages.hs
+++ b/Types/Messages.hs
@@ -15,7 +15,7 @@ import Data.Default
import System.Console.Regions (ConsoleRegion)
#endif
-data OutputType = NormalOutput | QuietOutput | ConcurrentOutput Int | JSONOutput
+data OutputType = NormalOutput | QuietOutput | ConcurrentOutput Int Bool | JSONOutput
deriving (Show)
data SideActionBlock = NoBlock | StartBlock | InBlock