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:
parent
a6ed23b82f
commit
a422a056f2
12 changed files with 33 additions and 20 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue