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/Rsync.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Remote/Rsync.hs') diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 9a38e4f1b..79d742aed 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -101,11 +101,11 @@ rsyncUrls o k = map use annexHashes f = keyFile k store :: RsyncOpts -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool -store o k _f p = sendAnnex k $ rsyncSend o p k +store o k _f p = sendAnnex k (void $ remove o k) $ rsyncSend o p k storeEncrypted :: RsyncOpts -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool storeEncrypted o (cipher, enck) k p = withTmp enck $ \tmp -> - sendAnnex k $ \src -> do + sendAnnex k (void $ remove o enck) $ \src -> do liftIO $ encrypt cipher (feedFile src) $ readBytes $ L.writeFile tmp rsyncSend o p enck tmp -- cgit v1.2.3