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

plumb VerifyConfig into retrieveKeyFile

Browse source 
This fixes the recent reversion that annex.verify is not honored,
because retrieveChunks was passed RemoteVerify baser, but baser
did not have export/import set up.

Sponsored-by: Dartmouth College's DANDI project
This commit is contained in:
Joey Hess 2021-08-17 12:41:36 -04:00
parent 4bbc6a25fa
commit f0754a61f5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
21 changed files with 64 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Remote/Helper/ExportImport.hs
View file

@ -171,14 +171,14 @@ adjustExportImport' isexport isimport r rs = do
, lockContent = if versioned
then lockContent r
else Nothing
, retrieveKeyFile = \k af dest p ->
, retrieveKeyFile = \k af dest p vc ->
if isimport
then supportversionedretrieve k af dest p $
then supportversionedretrieve k af dest p vc $
retrieveKeyFileFromImport dbv ciddbv k af dest p
else if isexport
then supportversionedretrieve k af dest p $
then supportversionedretrieve k af dest p vc $
retrieveKeyFileFromExport dbv k af dest p
else retrieveKeyFile r k af dest p
else retrieveKeyFile r k af dest p vc
, retrieveKeyFileCheap = if versioned
then retrieveKeyFileCheap r
else Nothing
@ -369,9 +369,9 @@ adjustExportImport' isexport isimport r rs = do
-- versionedExport remotes have a key/value store, so can use
-- the usual retrieveKeyFile, rather than an import/export
-- variant. However, fall back to that if retrieveKeyFile fails.
supportversionedretrieve k af dest p a
supportversionedretrieve k af dest p vc a
| versionedExport (exportActions r) =
retrieveKeyFile r k af dest p
retrieveKeyFile r k af dest p vc
`catchNonAsync` const a
| otherwise = a