diff options
| -rw-r--r-- | Messages.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Messages.hs b/Messages.hs index 6ea347ca4..a7f14f485 100644 --- a/Messages.hs +++ b/Messages.hs @@ -129,7 +129,7 @@ handle json normal = Annex.getState Annex.output >>= go where go Annex.NormalOutput = liftIO normal go Annex.QuietOutput = q - go Annex.JSONOutput = liftIO json + go Annex.JSONOutput = liftIO $ flushed $ json q :: Monad m => m () q = return () diff --git a/debian/changelog b/debian/changelog index e043f6c9f..cbf69b741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ git-annex (3.20111123) UNRELEASED; urgency=low * Put a workaround in the directory special remote for strange behavior with VFAT filesystems on Linux (mounted with shortname=mixed) + * Flush json output, avoiding a buffering problem that could result in + doubled output. -- Joey Hess <joeyh@debian.org> Tue, 22 Nov 2011 17:53:42 -0400 |