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

aws-0.21.1

Browse source 
* S3: Support enabling bucket versioning when built with aws-0.21.1.
* stack.yaml: Build with aws-0.21.1
This commit is contained in:
Joey Hess 2019-02-24 12:45:09 -04:00
parent 89ee156059
commit 19f833b0b1
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -2,6 +2,8 @@ git-annex (7.20190220) UNRELEASED; urgency=medium
* Fix storage of metadata values containing newlines. * Fix storage of metadata values containing newlines.
(Reversion introduced in version 7.20190122.) (Reversion introduced in version 7.20190122.)
* S3: Support enabling bucket versioning when built with aws-0.21.1.
* stack.yaml: Build with aws-0.21.1
-- Joey Hess <id@joeyh.name> Wed, 20 Feb 2019 14:20:59 -0400 -- Joey Hess <id@joeyh.name> Wed, 20 Feb 2019 14:20:59 -0400

4
Remote/S3.hs
View file

@ -859,7 +859,7 @@ getS3VersionIDPublicUrls mk info u k =
-- setting versioning in a bucket that git-annex has already exported -- setting versioning in a bucket that git-annex has already exported
-- files to risks losing the content of those un-versioned files. -- files to risks losing the content of those un-versioned files.
enableBucketVersioning :: SetupStage -> RemoteConfig -> RemoteGitConfig -> UUID -> Annex () enableBucketVersioning :: SetupStage -> RemoteConfig -> RemoteGitConfig -> UUID -> Annex ()
#if MIN_VERSION_aws(0,22,0) #if MIN_VERSION_aws(0,21,1)
enableBucketVersioning ss c gc u = do enableBucketVersioning ss c gc u = do
#else #else
enableBucketVersioning ss c _ _ = do enableBucketVersioning ss c _ _ = do
@ -874,7 +874,7 @@ enableBucketVersioning ss c _ _ = do
giveup "Cannot change versioning= of existing S3 remote." giveup "Cannot change versioning= of existing S3 remote."
where where
enableversioning b = do enableversioning b = do
#if MIN_VERSION_aws(0,22,0) #if MIN_VERSION_aws(0,21,1)
showAction "enabling bucket versioning" showAction "enabling bucket versioning"
hdl <- mkS3HandleVar c gc u hdl <- mkS3HandleVar c gc u
withS3HandleOrFail u hdl $ \h -> withS3HandleOrFail u hdl $ \h ->

2
stack.yaml
View file

@ -16,7 +16,7 @@ packages:
- '.' - '.'
extra-deps: extra-deps:
- IfElse-0.85 - IfElse-0.85
- aws-0.20 - aws-0.21.1
- bloomfilter-2.0.1.0 - bloomfilter-2.0.1.0
- tasty-1.1.0.4 - tasty-1.1.0.4
- tasty-rerun-1.1.13 - tasty-rerun-1.1.13