diff options
| author |  Benjamin Barenblat <bbarenblat@gmail.com> | 2022-01-19 13:44:58 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbarenblat@gmail.com> | 2022-01-19 13:44:58 -0500 |
| commit | d4f2b262a2afcc658c35694a089a983b9558b71a (patch) | |
| tree | 56013df1784ddc4b1b588be745c67ecde257a735 | |
| parent | 7b9f3501a40155ac05ea5b4fcda21e7f06d477ee (diff) | |
Use aws >= 0.20
aws-0.20 changed some types in a backward-incompatible way. Update to
that package, and adjust calls accordingly.
| -rw-r--r-- | Remote/S3.hs | 4 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index d25a07c76..b3e8e4ac4 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -1,6 +1,7 @@ {- S3 remotes - - Copyright 2011-2017 Joey Hess <id@joeyh.name> + - Copyright 2022 Benjamin Barenblat <bbarenblat@gmail.com> - - Licensed under the GNU GPL version 3 or higher. -} @@ -262,7 +263,8 @@ retrieveHelper info h object f p = liftIO $ runResourceT $ do (fr, fh) <- allocate (openFile f WriteMode) hClose let req = S3.getObject (bucket info) object S3.GetObjectResponse { S3.gorResponse = rsp } <- sendS3Handle' h req - responseBody rsp $$+- sinkprogressfile fh p zeroBytesProcessed + sealConduitT (responseBody rsp) $$+- + sinkprogressfile fh p zeroBytesProcessed release fr where sinkprogressfile fh meterupdate sofar = do diff --git a/git-annex.cabal b/git-annex.cabal index 3e31b7aa1..32fb60da6 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -304,7 +304,7 @@ Executable git-annex Other-Modules: Utility.Touch.Old if flag(S3) - Build-Depends: conduit, conduit-extra, aws (>= 0.9.2) + Build-Depends: conduit, conduit-extra, aws (>= 0.20) CPP-Options: -DWITH_S3 Other-Modules: Remote.S3 |