summaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-19 14:16:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-19 14:17:01 -0400
commit45221b79816ccc5b599039d7f80b772e4750effb (patch)
tree3246e8cccb25a8b3a38d7b620cf64d2cdc32acbd /Logs
parent700707e241c3018ee38bc9ac7cbd671169c278cd (diff)
Bugfix: Fixed bug parsing transfer info files
The newline after the filename was included in it. This was generally benign -- mostly these filenames are just displayed, and the newline didn't matter. But in the assistant, it caused unexpected dropping of preferred content. A characteristic of this bug is that the drop was displayed like this: drop some_file ok
Diffstat (limited to 'Logs')
-rw-r--r--Logs/Transfer.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index 0135f32dd..76412cf39 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -293,7 +293,8 @@ readTransferInfo mpid s = TransferInfo
<*> pure (if null filename then Nothing else Just filename)
<*> pure False
where
- (firstline, filename) = separate (== '\n') s
+ (firstline, rest) = separate (== '\n') s
+ (filename, _) = separate (== '\n') rest
bits = split " " firstline
numbits = length bits
time = if numbits > 0