diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-15 16:37:57 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-15 16:37:57 -0400 |
| commit | 186732d10740fec3b29751a6076c60148e3479f7 (patch) | |
| tree | a218c74c1f9fefe14a23beabc2ca46e5f4afc158 /Command | |
| parent | ecd610e955e0cfa5c88535039f434ea2a299068c (diff) | |
Revert "Clean up direct mode cache and mapping info when dropping keys."
This reverts commit f797939d15a2b414e62b28ccb0bd9e5b77978d76.
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!
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Drop.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Command/Drop.hs b/Command/Drop.hs index 8e5ecc952..f7491deae 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -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 |