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.
This commit is contained in:
Joey Hess 2016-05-16 14:49:12 -04:00
parent fb8ab2469d
commit 5f0b551c0c
Failed to extract signature
5 changed files with 38 additions and 4 deletions

2
debian/changelog vendored
View file

@ -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 <id@joeyh.name> Wed, 11 May 2016 16:08:38 -0400