diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-19 14:16:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-19 14:17:01 -0400 |
| commit | 45221b79816ccc5b599039d7f80b772e4750effb (patch) | |
| tree | 3246e8cccb25a8b3a38d7b620cf64d2cdc32acbd | |
| parent | 700707e241c3018ee38bc9ac7cbd671169c278cd (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
| -rw-r--r-- | Logs/Transfer.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 5 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 diff --git a/debian/changelog b/debian/changelog index cab911120..ab3f6f14b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ git-annex (3.20121212) UNRELEASED; urgency=low direct mode. * kqueue: Fix bug that made broken symlinks not be noticed. * vicfg: Quote filename. Closes: #696193 + * Bugfix: Fixed bug parsing transfer info files, where the newline after + the filename was included in it. This was generally benign, but in + the assistant, it caused unexpected dropping of preferred content. -- Joey Hess <joeyh@debian.org> Thu, 13 Dec 2012 14:06:43 -0400 |