summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-10-11 10:57:20 -0400
committerJoey Hess <joeyh@joeyh.name>2017-10-11 10:57:20 -0400
commit61dccecad7d9110ecaf339eeceab7e109b3118c1 (patch)
tree0fd9f7a7e75c8d3c119ebdfc798050001760f0bf
parent16fde7d4a66a5b71d1b2a447e640aa63f1198d94 (diff)
Fix build with aws-0.17.
This commit was sponsored by Denis Dzyubenko on Patreon.
-rw-r--r--CHANGELOG1
-rw-r--r--Remote/S3.hs3
-rw-r--r--doc/bugs/Cannot_build_with_aws_0.17.1.mdwn2
-rw-r--r--stack.yaml2
4 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index efc81de..d968476 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
git-annex (6.20171004) UNRELEASED; urgency=medium
* webdav: Make --debug show all webdav operations.
+ * Fix build with aws-0.17.
-- Joey Hess <id@joeyh.name> Sat, 07 Oct 2017 14:11:00 -0400
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 5e76b98..5b100eb 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -497,6 +497,9 @@ withS3HandleMaybe c gc u a = do
Just creds -> do
awscreds <- liftIO $ genCredentials creds
let awscfg = AWS.Configuration AWS.Timestamp awscreds debugMapper
+#ifdef MIN_VERSION_aws(0,11,0)
+ Nothing
+#endif
bracketIO (newManager managerSettings) closeManager $ \mgr ->
a $ Just $ S3Handle mgr awscfg s3cfg
Nothing -> a Nothing
diff --git a/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn b/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn
index c28560c..3a3a528 100644
--- a/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn
+++ b/doc/bugs/Cannot_build_with_aws_0.17.1.mdwn
@@ -43,3 +43,5 @@ Full build log is here: https://gist.github.com/ilovezfs/661a158dbe8aac33802f9b4
### 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]] --[[Joey]]
diff --git a/stack.yaml b/stack.yaml
index d40b53e..e8f36f4 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,7 +17,7 @@ flags:
packages:
- '.'
extra-deps:
-- aws-0.16
+- aws-0.17.1
- bloomfilter-2.0.1.0
- torrent-10000.1.1
- yesod-default-1.2.0