diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-07 13:01:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-07 13:01:57 -0400 |
| commit | 1970a79492e47556d7ca7fbac35ab1a8bf86d9af (patch) | |
| tree | 9cc5c7b6720487468dd4525c8f5ef327cf0fe15c | |
| parent | 6771d73d9df3b610d723c8e7ed197a8995bf41d4 (diff) | |
Fix build with aws 0.16. Thanks, aristidb.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Remote/S3.hs | 2 | ||||
| -rw-r--r-- | doc/bugs/aws_0.16_breaking_changes.mdwn | 2 | ||||
| -rw-r--r-- | doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn | 2 |
4 files changed, 5 insertions, 2 deletions
@@ -27,6 +27,7 @@ git-annex (6.20170102) UNRELEASED; urgency=medium shipped in a Debian stable release. If that turns out to not be the case, this change will need to be cherry-picked into the git-annex in Debian stable, or its wormhole pairing will break. + * Fix build with aws 0.16. Thanks, aristidb. -- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400 diff --git a/Remote/S3.hs b/Remote/S3.hs index 2b7c58e6f..43d07230e 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -221,7 +221,7 @@ store _r info h = fileStorer $ \k f p -> do let popper = handlePopper numchunks defaultChunkSize p' fh let req = S3.uploadPart (bucket info) object partnum uploadid $ RequestBodyStream (fromIntegral sz) popper - S3.UploadPartResponse _ etag <- sendS3Handle h req + S3.UploadPartResponse { S3.uprETag = etag } <- sendS3Handle h req sendparts (offsetMeterUpdate meter (toBytesProcessed sz)) (etag:etags) (partnum + 1) sendparts p [] 1 diff --git a/doc/bugs/aws_0.16_breaking_changes.mdwn b/doc/bugs/aws_0.16_breaking_changes.mdwn index 2560d4fca..e03180c34 100644 --- a/doc/bugs/aws_0.16_breaking_changes.mdwn +++ b/doc/bugs/aws_0.16_breaking_changes.mdwn @@ -40,3 +40,5 @@ BuildError: Failed executing: cabal install --jobs=8 --max-backjumps=100000 --pr ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) Yes! + +> [[fixed|done]] thanks --[[Joey]] diff --git a/doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn b/doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn index 28ad4a88f..9af372600 100644 --- a/doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn +++ b/doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn @@ -48,4 +48,4 @@ Not sure, I got this build failure report from ilovezfs who I think uses Max OS ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) - +> [[fixed|done]], thanks --[[Joey]] |