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

Merge branch 'master' into borg

Browse source
This commit is contained in:
Joey Hess 2020-12-17 16:50:25 -04:00
commit 933c86f186
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Remote/S3.hs
View file

@ -656,7 +656,10 @@ retrieveExportWithContentIdentifierS3 hv r rs info loc cid dest mkkey p = withS3
S3.getObject (bucket info) o S3.getObject (bucket info) o
k <- mkkey k <- mkkey
case extractContentIdentifier cid o of case extractContentIdentifier cid o of
Right vid -> setS3VersionID info rs k vid Right vid -> do
vids <- getS3VersionID rs k
unless (vid `elem` map Just vids) $
setS3VersionID info rs k vid
Left _ -> noop Left _ -> noop
return k return k
Nothing -> giveup $ needS3Creds (uuid r) Nothing -> giveup $ needS3Creds (uuid r)
@ -1132,7 +1135,7 @@ getPublicUrlMaker info = case publicurl info of
-- version id involves a request for an object, so this keeps track of what -- version id involves a request for an object, so this keeps track of what
-- the object is. -- the object is.
data S3VersionID = S3VersionID S3.Object T.Text data S3VersionID = S3VersionID S3.Object T.Text
deriving (Show) deriving (Show, Eq)
-- smart constructor -- smart constructor
mkS3VersionID :: S3.Object -> Maybe T.Text -> Maybe S3VersionID mkS3VersionID :: S3.Object -> Maybe T.Text -> Maybe S3VersionID