diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-09 18:42:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-09 18:42:29 -0400 |
| commit | 0c893f8743bab81077e3ee0fed0993b746d7a269 (patch) | |
| tree | b3ddc0665c28fadbfac58fbc43fc8a9dc85f3956 /Remote/Glacier.hs | |
| parent | 680e6839ee42c754a58f8e57bf15a8063a16c6bb (diff) | |
Special remotes now all rollback storage of keys that get modified during the transfer, which can happen in direct mode.
Diffstat (limited to 'Remote/Glacier.hs')
| -rw-r--r-- | Remote/Glacier.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index 37fcb0c9f..173e366d2 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -85,12 +85,12 @@ store r k _f m | keySize k == Just 0 = do warning "Cannot store empty files in Glacier." return False - | otherwise = sendAnnex k $ \src -> + | otherwise = sendAnnex k (void $ remove r k) $ \src -> metered (Just m) k $ \meterupdate -> storeHelper r k $ streamMeteredFile src meterupdate storeEncrypted :: Remote -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool -storeEncrypted r (cipher, enck) k m = sendAnnex k $ \src -> do +storeEncrypted r (cipher, enck) k m = sendAnnex k (void $ remove r enck) $ \src -> do metered (Just m) k $ \meterupdate -> storeHelper r enck $ \h -> encrypt cipher (feedFile src) |