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

fix call to warnExportImportConflict

Browse source 
That needs a Remote that has the right export/import set up, not the input
Remote, which does not yet.
This commit is contained in:
Joey Hess 2020-12-17 16:25:02 -04:00
parent a4451ac391
commit 77aedbef8b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Remote/Helper/ExportImport.hs
View file

@ -104,11 +104,7 @@ adjustExportImport :: Remote -> RemoteStateHandle -> Annex Remote
adjustExportImport r rs = do
isexport <- pure (exportTree (config r)) <&&> isExportSupported r
isimport <- pure (importTree (config r)) <&&> isImportSupported r
let normal = not isexport && not isimport
let iskeyvaluestore = normal || appendonly r
dbv <- prepdbv
ciddbv <- prepciddb
return $ r
let r' = r
{ remotetype = (remotetype r)
{ exportSupported = if isexport
then exportSupported (remotetype r)
@ -117,7 +113,19 @@ adjustExportImport r rs = do
then importSupported (remotetype r)
else importUnsupported
}
, exportActions = if isexport
}
if not isexport && not isimport
then return r'
else adjustExportImport' isexport isimport r' rs
adjustExportImport' :: Bool -> Bool -> Remote -> RemoteStateHandle -> Annex Remote
adjustExportImport' isexport isimport r rs = do
dbv <- prepdbv
ciddbv <- prepciddb
let normal = not isexport && not isimport
let iskeyvaluestore = normal || appendonly r
return $ r
{ exportActions = if isexport
then if isimport
then exportActionsForImport dbv ciddbv (exportActions r)
else exportActions r