From d7820aa98ad0fe973d0a1aae2861abdab60de7a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 May 2016 14:49:12 -0400 Subject: assistant: Fix race in v6 mode that caused downloaded file content to sometimes not replace pointer files. The keys database handle needs to be closed after merging, because the smudge filter, in another process, updates the database. Old cached info can be read for a while from the open database handle; closing it ensures that the info written by the smudge filter is available. This is pretty horribly ad-hoc, and it's especially nasty that the transferrer closes the database every time. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index af54ed566..e9de8bce8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (6.20160512) UNRELEASED; urgency=medium original branch. * assistant: Fix bug that caused v6 pointer files to be annexed by the assistant. + * assistant: Fix race in v6 mode that caused downloaded file content to + sometimes not replace pointer files. -- Joey Hess Wed, 11 May 2016 16:08:38 -0400 -- cgit v1.2.3