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.
This commit is contained in:
parent
f4db181d9b
commit
eba68572dc
9 changed files with 106 additions and 5 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue