Fix build with aws-0.17.
This commit was sponsored by Denis Dzyubenko on Patreon.
This commit is contained in:
parent
16fde7d4a6
commit
61dccecad7
4 changed files with 7 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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]]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue