From 0c893f8743bab81077e3ee0fed0993b746d7a269 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 9 Jan 2013 18:42:29 -0400 Subject: Special remotes now all rollback storage of keys that get modified during the transfer, which can happen in direct mode. --- Remote/Directory.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Remote/Directory.hs') diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 1273c2d64..922742099 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -111,7 +111,7 @@ withStoredFiles :: ChunkSize -> FilePath -> Key -> ([FilePath] -> IO Bool) -> IO withStoredFiles = withCheckedFiles doesFileExist store :: FilePath -> ChunkSize -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool -store d chunksize k _f p = sendAnnex k $ \src -> +store d chunksize k _f p = sendAnnex k (void $ remove d k) $ \src -> metered (Just p) k $ \meterupdate -> storeHelper d chunksize k $ \dests -> case chunksize of @@ -125,7 +125,7 @@ store d chunksize k _f p = sendAnnex k $ \src -> =<< L.readFile src storeEncrypted :: FilePath -> ChunkSize -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool -storeEncrypted d chunksize (cipher, enck) k p = sendAnnex k $ \src -> +storeEncrypted d chunksize (cipher, enck) k p = sendAnnex k (void $ remove d enck) $ \src -> metered (Just p) k $ \meterupdate -> storeHelper d chunksize enck $ \dests -> encrypt cipher (feedFile src) $ readBytes $ \b -> -- cgit v1.2.3