mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix build with aws 0.16. Thanks, aristidb.

Browse source
This commit is contained in:
Joey Hess 2017-02-07 13:01:57 -04:00
parent 5f873be329
commit 655f707990
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -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 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 case, this change will need to be cherry-picked into the git-annex in
Debian stable, or its wormhole pairing will break. 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 -- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400

2
Remote/S3.hs
View file

@ -221,7 +221,7 @@ store _r info h = fileStorer $ \k f p -> do
let popper = handlePopper numchunks defaultChunkSize p' fh let popper = handlePopper numchunks defaultChunkSize p' fh
let req = S3.uploadPart (bucket info) object partnum uploadid $ let req = S3.uploadPart (bucket info) object partnum uploadid $
RequestBodyStream (fromIntegral sz) popper 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 (offsetMeterUpdate meter (toBytesProcessed sz)) (etag:etags) (partnum + 1)
sendparts p [] 1 sendparts p [] 1

2
doc/bugs/aws_0.16_breaking_changes.mdwn
View file

@ -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) ### 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! Yes!
> [[fixed|done]] thanks --[[Joey]]

2
doc/bugs/git-annex_does_not_build_with_aws_0.16.mdwn
View file

@ -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) ### 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]]