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
|
@ -16,6 +16,7 @@ import Annex.WorkTree
|
|||
import Annex.Content
|
||||
import Annex.UUID
|
||||
import Annex.Perms
|
||||
import Logs.Location
|
||||
import Utility.FileMode
|
||||
#ifndef mingw32_HOST_OS
|
||||
import Creds
|
||||
|
@ -212,7 +213,7 @@ storeReceived f = do
|
|||
Nothing -> do
|
||||
warning $ "Received a file " ++ f ++ " that is not a git-annex key. Deleting this file."
|
||||
liftIO $ removeWhenExistsWith R.removeLink (toRawFilePath f)
|
||||
Just k -> void $
|
||||
Just k -> void $ logStatusAfter k $
|
||||
getViaTmpFromDisk RetrievalVerifiableKeysSecure AlwaysVerify k (AssociatedFile Nothing) $ \dest -> unVerified $
|
||||
liftIO $ catchBoolIO $ do
|
||||
rename f (fromRawFilePath dest)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue