From 1f09b709fc8e878937fc3396632ee03a0600331e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 19 Jun 2023 11:24:32 -0400 Subject: [PATCH] skip sending individual files to export remotes That will fail, and it already exports whole trees. f6dd34ca817bdf38d7b8d79be3ed626a266e3232 made it sync content with import remotes, and if an import remote is also an export remote, that caused this new failure mode. Sponsored-by: Brock Spratlen on Patreon --- Command/Sync.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index 443092cb90..3aeb20a244 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -296,9 +296,9 @@ seek' o = do (filter isExport contentremotes) -- Sync content with remotes, including - -- with import remotes (since importing - -- only downloads new files not old files), - -- but not with export only remotes. + -- importing from import remotes (since + -- importing only downloads new files not + -- old files) let shouldsynccontent r | isExport r && not (isImport r) = False | otherwise = True @@ -926,6 +926,7 @@ syncFile o ebloom rs af k = do wantput r | pushOption o == False = return False | Remote.readonly r || remoteAnnexReadOnly (Remote.gitconfig r) = return False + | isExport r = return False | isThirdPartyPopulated r = return False | otherwise = wantGetBy True (Just k) af (Remote.uuid r) handleput lack inhere