diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-27 11:45:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-27 11:45:13 -0400 |
| commit | d76362a5986f004a61ed5484f95a592e33ef5e43 (patch) | |
| tree | b1b55e8a13efddf3aa1d24c3002071c4ced857c6 /Logs/MapLog.hs | |
| parent | e184360d5d2225b50117b0deddb28c0537dfb181 (diff) | |
Split lines in the git-annex branch on \r as well as \n, to deal with \r\n terminated lines written by some versions of git-annex on Windows.
This fixes strange displays in some cases, including whereis showing
many duplicate locations, and showing more total copies than actually
exist.
It's unknown if that lead to data loss when eg, dropping. At the moment,
it seems unlikely it could, since the UUID with \r's appended is not the
same as a UUID without, and so no remote matches it.
It's also unknown if \r's can leak in on windows, perhaps when merging the
git-annex branch.
Diffstat (limited to 'Logs/MapLog.hs')
| -rw-r--r-- | Logs/MapLog.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Logs/MapLog.hs b/Logs/MapLog.hs index d5bb67f68..097439ac5 100644 --- a/Logs/MapLog.hs +++ b/Logs/MapLog.hs @@ -18,6 +18,7 @@ import Data.Time.Clock.POSIX import Common import Logs.TimeStamp +import Logs.Line data TimeStamp = Unknown | Date POSIXTime deriving (Eq, Ord, Show) @@ -38,7 +39,7 @@ showMapLog fieldshower valueshower = unlines . map showpair . M.toList unwords ["0", fieldshower f, valueshower v] parseMapLog :: Ord f => (String -> Maybe f) -> (String -> Maybe v) -> String -> MapLog f v -parseMapLog fieldparser valueparser = M.fromListWith best . mapMaybe parse . lines +parseMapLog fieldparser valueparser = M.fromListWith best . mapMaybe parse . splitLines where parse line = do let (ts, rest) = splitword line |