diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-29 16:22:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-29 16:28:44 -0400 |
| commit | 99e69a42d1afc02c381657e82547dfcc9f2a6ae2 (patch) | |
| tree | e38a15038aa62dfdad0873bc3b4b874d5e0f254e /Remote/Directory | |
| parent | 48674a62c7d1fb9932c2bd234e6f851ec75478ac (diff) | |
lift types from IO to Annex
Some remotes like External need to run store and retrieve actions in Annex,
not IO. In order to do that lift, I had to dive pretty deep into the
utilities, making Utility.Gpg and Utility.Tmp be partly converted to using
MonadIO, and Control.Monad.Catch for exception handling.
There should be no behavior changes in this commit.
This commit was sponsored by Michael Barabanov.
Diffstat (limited to 'Remote/Directory')
| -rw-r--r-- | Remote/Directory/LegacyChunked.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Directory/LegacyChunked.hs b/Remote/Directory/LegacyChunked.hs index af846a2e6..312119f4e 100644 --- a/Remote/Directory/LegacyChunked.hs +++ b/Remote/Directory/LegacyChunked.hs @@ -96,7 +96,7 @@ retrieve locations d basek a = do tmpdir <- fromRepo $ gitAnnexTmpMiscDir createAnnexDirectory tmpdir let tmp = tmpdir </> keyFile basek ++ ".directorylegacy.tmp" - a $ Just $ byteRetriever $ \k -> do + a $ Just $ byteRetriever $ \k -> liftIO $ do void $ withStoredFiles d locations k $ \fs -> do forM_ fs $ S.appendFile tmp <=< S.readFile |