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

Merge branch 'master' into importtree

Browse source
This commit is contained in:
Joey Hess 2019-02-26 11:36:36 -04:00
commit 760f26ebc6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 223 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Remote/S3.hs
View file

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