mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Clean up direct mode cache and mapping info when dropping keys.

Browse source 
These files were left behind, and made getKeysPresent find keys that were
not present. It would be expensive to make getKeysPresent check that the
actual key files are present (it just lists the directories). But that's not
needed if we just clean up the stale cache and mapping files.

To handle systems that were in direct mode and got switched back with stale
direct mode files, made cleanObjectLoc remove all files in the key's directory.

git annex unused will still list keys that are gone but for which the stale
direct mode files exists. To deal with that, made dropunused remove the key's
directory even if the key does not seem to be present.
This commit is contained in:
Joey Hess 2013-02-07 08:28:40 -04:00
parent 21cfce02ee
commit 57780cb3a4
5 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Drop.hs
View file

@ -60,7 +60,10 @@ 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
whenM (inAnnex key) $
removeAnnex key
{- Clean up stale direct mode files that may exist. -}
cleanObjectLoc key
next $ cleanupLocal key
performRemote :: Key -> Maybe Int -> Remote -> CommandPerform