sync content with import remotes

This didn't used to be needed because importKeys would import all
content and so doing another pass was redundant.

But since 40017089f2 it uses
importChanges, so only new files are imported. If a file that was
already imported before was dropped, that would prevent sync --content
from gettng its content again.

Sponsored-by: Jack Hill on Patreon
This commit is contained in:
Joey Hess 2023-06-01 18:52:19 -04:00
parent 92e4ed3cc0
commit f6dd34ca81
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -295,13 +295,16 @@ seek' o = do
seekExportContent (Just o) seekExportContent (Just o)
(filter isExport contentremotes) (filter isExport contentremotes)
-- Sync content with remotes, but not with -- Sync content with remotes, including
-- export or import remotes, which handle content -- with import remotes (since importing
-- syncing as part of export and import. -- only downloads new files not old files),
-- but not with export only remotes.
let shouldsynccontent r
| isExport r && not (isImport r) = False
| otherwise = True
syncedcontent <- withbranch $ syncedcontent <- withbranch $
seekSyncContent o $ filter seekSyncContent o
(\r -> not (isExport r || isImport r)) (filter shouldsynccontent contentremotes)
contentremotes
-- Transferring content can take a while, -- Transferring content can take a while,
-- and other changes can be pushed to the -- and other changes can be pushed to the