make getViaTmpFrom no longer update location log

All callers adjusted to update it themselves.

In Command.ReKey, and Command.SetKey, the cleanup action already did,
so it was updating the log twice before.

This fixes a bug when annex.stalldetection is set, as now
Command.Transferrer can skip updating the location log, and let it be
updated by the calling process.
This commit is contained in:
Joey Hess 2020-12-11 11:33:10 -04:00
parent a6ed23b82f
commit a422a056f2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
12 changed files with 33 additions and 20 deletions

View file

@ -690,7 +690,7 @@ copyToRemote' repo r st@(State connpool duc _ _ _) key file meterupdate
copier <- mkCopier hardlink st params
let verify = Annex.Content.RemoteVerify r
let rsp = RetrievalAllKeysSecure
res <- Annex.Content.getViaTmp rsp verify key file $ \dest ->
res <- logStatusAfter key $ Annex.Content.getViaTmp rsp verify key file $ \dest ->
metered (Just (combineMeterUpdate meterupdate p)) key $ \_ p' ->
copier object (fromRawFilePath dest) p' (liftIO checksuccessio)
Annex.Content.saveState True