aboutsummaryrefslogtreecommitdiff
path: root/Remote/S3.hs
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbarenblat@gmail.com>2022-01-19 13:44:58 -0500
committerGravatar Benjamin Barenblat <bbarenblat@gmail.com>2022-01-19 13:44:58 -0500
commitd4f2b262a2afcc658c35694a089a983b9558b71a (patch)
tree56013df1784ddc4b1b588be745c67ecde257a735 /Remote/S3.hs
parent7b9f3501a40155ac05ea5b4fcda21e7f06d477ee (diff)
Use aws >= 0.20
aws-0.20 changed some types in a backward-incompatible way. Update to that package, and adjust calls accordingly.
Diffstat (limited to 'Remote/S3.hs')
-rw-r--r--Remote/S3.hs4
1 files changed, 3 insertions, 1 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