proxied exporttree=yes versionedexport=yes remotes are not untrusted

This removes versionedExport, which was only used by the S3 special
remote. Instead, versionedexport=yes is a common way for remotes to
indicate that they are versioned.
This commit is contained in:
Joey Hess 2024-08-08 15:13:12 -04:00
parent 5c36177e58
commit 3ea835c7e8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
16 changed files with 23 additions and 53 deletions

View file

@ -42,7 +42,6 @@ instance HasExportUnsupported (ExportActions Annex) where
, retrieveExport = nope
, checkPresentExport = \_ _ -> return False
, removeExport = nope
, versionedExport = False
, removeExportDirectory = nope
, renameExport = Nothing
}
@ -137,7 +136,6 @@ adjustExportImport' :: Bool -> Bool -> Bool -> Remote -> RemoteStateHandle -> Gi
adjustExportImport' isexport isimport annexobjects r rs gc = do
dbv <- prepdbv
ciddbv <- prepciddb
let versioned = versionedExport (exportActions r)
return $ r
{ exportActions = if isexport
then if isimport
@ -249,6 +247,8 @@ adjustExportImport' isexport isimport annexobjects r rs gc = do
else is'
}
where
versioned = isVersioning (config r)
thirdpartypopulated = thirdPartyPopulated (remotetype r)
-- exportActions adjusted to use the equivalent import actions,
@ -457,12 +457,12 @@ adjustExportImport' isexport isimport annexobjects r rs gc = do
_ -> throwM err
| otherwise = a
-- versionedExport remotes have a key/value store which
-- versioned remotes have a key/value store which
-- the usual retrieveKeyFile can be used with, rather than
-- an import/export variant. However, fall back to that
-- if retrieveKeyFile fails.
supportversionedretrieve k af dest p vc a
| versionedExport (exportActions r) =
| versioned =
retrieveKeyFile r k af dest p vc
`catchNonAsync` const a
| otherwise = a