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/Transitions.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/Transitions.hs')
| -rw-r--r-- | Logs/Transitions.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Logs/Transitions.hs b/Logs/Transitions.hs index 544004768..07667c407 100644 --- a/Logs/Transitions.hs +++ b/Logs/Transitions.hs @@ -19,6 +19,7 @@ import qualified Data.Set as S import Annex.Common import Logs.TimeStamp +import Logs.Line transitionsLog :: FilePath transitionsLog = "transitions.log" @@ -50,7 +51,7 @@ showTransitions = unlines . map showTransitionLine . S.elems {- If the log contains new transitions we don't support, returns Nothing. -} parseTransitions :: String -> Maybe Transitions -parseTransitions = check . map parseTransitionLine . lines +parseTransitions = check . map parseTransitionLine . splitLines where check l | all isJust l = Just $ S.fromList $ catMaybes l |