From 19f833b0b1d34fa86cab7f5b56b03a28e6384245 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 24 Feb 2019 12:45:09 -0400 Subject: [PATCH] aws-0.21.1 * S3: Support enabling bucket versioning when built with aws-0.21.1. * stack.yaml: Build with aws-0.21.1 --- CHANGELOG | 2 ++ Remote/S3.hs | 4 ++-- stack.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b74d7d1fde..885ec8325d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ git-annex (7.20190220) UNRELEASED; urgency=medium * Fix storage of metadata values containing newlines. (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 Wed, 20 Feb 2019 14:20:59 -0400 diff --git a/Remote/S3.hs b/Remote/S3.hs index 83770d6753..b5bd3943d9 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -859,7 +859,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 @@ -874,7 +874,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 -> diff --git a/stack.yaml b/stack.yaml index 5653705f82..df1d4dfe09 100644 --- a/stack.yaml +++ b/stack.yaml @@ -16,7 +16,7 @@ packages: - '.' extra-deps: - IfElse-0.85 -- aws-0.20 +- aws-0.21.1 - bloomfilter-2.0.1.0 - tasty-1.1.0.4 - tasty-rerun-1.1.13