diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-07 08:28:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-07 08:28:40 -0400 |
| commit | f797939d15a2b414e62b28ccb0bd9e5b77978d76 (patch) | |
| tree | 4095dd3f6e97bc1d7638cfbecbd1e75ce002af95 /Command | |
| parent | a7b151f28926f3a6455f4456c496aeaf31df091a (diff) | |
Clean up direct mode cache and mapping info when dropping keys.
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.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Drop.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Command/Drop.hs b/Command/Drop.hs index f7491deae..8e5ecc952 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -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 |