aws-0.22 improved its support for setting etags, which improves support for versioned...

Remove placeholder version number I used when implementing the feature in
aws.

This commit was sponsored by Ethan Aubin.

diff --git a/CHANGELOG b/CHANGELOG
index c1d329dd10d6ab790511f1b34e43e6fab679984d..fed1ac5d6275511d86bf64799c12d2d701869485 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+git-annex (8.20200909) UNRELEASED; urgency=medium
+
+  * aws-0.22 improved its support for setting etags, which improves
+    support for versioned S3 buckets.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 14 Sep 2020 18:34:37 -0400
+
 git-annex (8.20200908) upstream; urgency=medium
 
   * Added httpalso special remote, which is useful for accessing 

diff --git a/Remote/S3.hs b/Remote/S3.hs
index 99f8b41d840d480db9cbc7e35d00508390ad986d..960fa7fa5030fffc6a859ab00a96ffa6ab5512d3 100644 (file)
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -347,10 +347,7 @@ storeHelper info h magic f object p = liftIO $ case partSize info of
                resp <- sendS3Handle h req
                vid <- mkS3VersionID object
                        <$> extractFromResourceT (S3.porVersionId resp)
-               -- FIXME Actual aws version that supports this is not known,
-               -- patch not merged yet.
-               -- https://github.com/aristidb/aws/issues/258
-#if MIN_VERSION_aws(0,99,0)
+#if MIN_VERSION_aws(0,22,0)
                etag <- extractFromResourceT (Just (S3.porETag resp))
                return (etag, vid)
 #else
@@ -685,10 +682,7 @@ rewritePreconditionException a = catchJust (Url.matchStatusCodeException want) a
 storeExportWithContentIdentifierS3 :: S3HandleVar -> Remote -> RemoteStateHandle -> S3Info -> Maybe Magic -> FilePath -> Key -> ExportLocation -> [ContentIdentifier] -> MeterUpdate -> Annex ContentIdentifier
 storeExportWithContentIdentifierS3 hv r rs info magic src k loc _overwritablecids p
        | versioning info = go
-       -- FIXME Actual aws version that supports getting Etag for a store
-       -- is not known; patch not merged yet.
-       -- https://github.com/aristidb/aws/issues/258
-#if MIN_VERSION_aws(0,99,0)
+#if MIN_VERSION_aws(0,22,0)
        | otherwise = go
 #else
        | otherwise = giveup "git-annex is built with too old a version of the aws library to support this operation"