From 7da2e27293d4ec5de5b52756cfc768d5d65f2be6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Dec 2012 14:16:58 -0400 Subject: [PATCH] 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 --- Logs/Transfer.hs | 3 ++- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs index 0135f32dd6..76412cf391 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 cab9111202..ab3f6f14b8 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 Thu, 13 Dec 2012 14:06:43 -0400