From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 7 Feb 2017 17:01:57 +0000 (-0400)
Subject: Fix build with aws 0.16. Thanks, aristidb.
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~275^2~657
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=655f707990b4144ac82244c19188af0e15bff546;p=git-annex.git

Fix build with aws 0.16. Thanks, aristidb.
---

diff --git a/CHANGELOG b/CHANGELOG
index 1237a2d616..4343b83eb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 2b7c58e6fc..43d07230e7 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 2560d4fca2..e03180c347 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 28ad4a88fb..9af3726009 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]]