Revert "Clean up direct mode cache and mapping info when dropping keys."
This reverts commit 57780cb3a4
.
This was buggy, it caused the direct mode cache to be lost when dropping
keys, so when the file is gotten back, it's stored in indirect mode.
Note to self: Do not attempt bug fixes at 6 am!
This commit is contained in:
parent
80fa144d79
commit
5a8fb26d0a
4 changed files with 11 additions and 14 deletions
|
@ -60,10 +60,7 @@ performLocal key numcopies knownpresentremote = lockContent key $ do
|
|||
untrusteduuids <- trustGet UnTrusted
|
||||
let tocheck = Remote.remotesWithoutUUID remotes (trusteduuids'++untrusteduuids)
|
||||
stopUnless (canDropKey key numcopies trusteduuids' tocheck []) $ do
|
||||
whenM (inAnnex key) $
|
||||
removeAnnex key
|
||||
{- Clean up stale direct mode files that may exist. -}
|
||||
cleanObjectLoc key
|
||||
whenM (inAnnex key) $ removeAnnex key
|
||||
next $ cleanupLocal key
|
||||
|
||||
performRemote :: Key -> Maybe Int -> Remote -> CommandPerform
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue