From 6dbf044223969e37b5b4aa495f4ffa86b51d7596 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 Feb 2014 22:46:55 -0400 Subject: sync --content: Drop files from remotes that don't have them after getting them. Need to include the uuid of the local repo in the list of belived locations of a key after getting it, in order for the drop from remote to include it in the numcopies calculation. --- Command/Sync.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Command') diff --git a/Command/Sync.hs b/Command/Sync.hs index 0507fd680..c9493b2a4 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -37,6 +37,7 @@ import Command.Get (getKeyFile') import qualified Command.Move import Logs.Location import Annex.Drop +import Annex.UUID import qualified Data.Set as S import Data.Hash.MD5 @@ -526,12 +527,15 @@ syncFile rs f (k, _) = do locs <- loggedLocations k let (have, lack) = partition (\r -> Remote.uuid r `elem` locs) rs - sequence_ =<< handleget have + got <- anyM id =<< handleget have putrs <- catMaybes . snd . unzip <$> (sequence =<< handleput lack) + u <- getUUID + let locs' = concat [if got then [u] else [], putrs, locs] + -- Using callCommandAction rather than commandAction for drops, -- because a failure to drop does not mean the sync failed. - handleDropsFrom (putrs ++ locs) rs "unwanted" True k (Just f) + handleDropsFrom locs' rs "unwanted" True k (Just f) Nothing callCommandAction where wantget have = allM id -- cgit v1.2.3