From 186732d10740fec3b29751a6076c60148e3479f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 15 Feb 2013 16:37:57 -0400 Subject: 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! --- Command/Drop.hs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Command') 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 -- cgit v1.2.3