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/Hook.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/Hook.hs')
| -rw-r--r-- | Remote/Hook.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 1b8c91d09..8b0231203 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -103,12 +103,12 @@ runHook hooktype hook k f a = maybe (return False) run =<< lookupHook hooktype h ) store :: String -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool -store h k _f _p = sendAnnex k $ \src -> +store h k _f _p = sendAnnex k (void $ remove h k) $ \src -> runHook h "store" k (Just src) $ return True storeEncrypted :: String -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool storeEncrypted h (cipher, enck) k _p = withTmp enck $ \tmp -> - sendAnnex k $ \src -> do + sendAnnex k (void $ remove h enck) $ \src -> do liftIO $ encrypt cipher (feedFile src) $ readBytes $ L.writeFile tmp runHook h "store" enck (Just tmp) $ return True |