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

Fix build with aws-0.17.

Browse source 
This commit was sponsored by Denis Dzyubenko on Patreon.
This commit is contained in:
Joey Hess 2017-10-11 10:57:20 -04:00
parent 16fde7d4a6
commit 61dccecad7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -1,6 +1,7 @@
git-annex (6.20171004) UNRELEASED; urgency=medium git-annex (6.20171004) UNRELEASED; urgency=medium
* webdav: Make --debug show all webdav operations. * 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 -- Joey Hess <id@joeyh.name> Sat, 07 Oct 2017 14:11:00 -0400

3
Remote/S3.hs
View file

@ -497,6 +497,9 @@ withS3HandleMaybe c gc u a = do
Just creds -> do Just creds -> do
awscreds <- liftIO $ genCredentials creds awscreds <- liftIO $ genCredentials creds
let awscfg = AWS.Configuration AWS.Timestamp awscreds debugMapper let awscfg = AWS.Configuration AWS.Timestamp awscreds debugMapper
#ifdef MIN_VERSION_aws(0,11,0)
Nothing
#endif
bracketIO (newManager managerSettings) closeManager $ \mgr -> bracketIO (newManager managerSettings) closeManager $ \mgr ->
a $ Just $ S3Handle mgr awscfg s3cfg a $ Just $ S3Handle mgr awscfg s3cfg
Nothing -> a Nothing Nothing -> a Nothing

2
doc/bugs/Cannot_build_with_aws_0.17.1.mdwn
View file

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

2
stack.yaml
View file

@ -17,7 +17,7 @@ flags:
packages: packages:
- '.' - '.'
extra-deps: extra-deps:
- aws-0.16 - aws-0.17.1
- bloomfilter-2.0.1.0 - bloomfilter-2.0.1.0
- torrent-10000.1.1 - torrent-10000.1.1
- yesod-default-1.2.0 - yesod-default-1.2.0