mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Bugfix: Fixed bug parsing transfer info files

Browse source 
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
This commit is contained in:
Joey Hess 2012-12-19 14:16:58 -04:00
parent f3833dfe35
commit 7da2e27293
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Logs/Transfer.hs
View file

@ -293,7 +293,8 @@ readTransferInfo mpid s = TransferInfo
<*> pure (if null filename then Nothing else Just filename) <*> pure (if null filename then Nothing else Just filename)
<*> pure False <*> pure False
where where
(firstline, filename) = separate (== '\n') s (firstline, rest) = separate (== '\n') s
(filename, _) = separate (== '\n') rest
bits = split " " firstline bits = split " " firstline
numbits = length bits numbits = length bits
time = if numbits > 0 time = if numbits > 0

3
debian/changelog vendored
View file

@ -7,6 +7,9 @@ git-annex (3.20121212) UNRELEASED; urgency=low
direct mode. direct mode.
* kqueue: Fix bug that made broken symlinks not be noticed. * kqueue: Fix bug that made broken symlinks not be noticed.
* vicfg: Quote filename. Closes: #696193 * 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 -- Joey Hess <joeyh@debian.org> Thu, 13 Dec 2012 14:06:43 -0400