From 2a04e215e10469ee3bab5d1a5d6d76b0c35cc46c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 6 Dec 2012 13:22:16 -0400 Subject: --auto fixes * get/copy --auto: Transfer data even if it would exceed numcopies, when preferred content settings want it. * drop --auto: Fix dropping content when there are no preferred content settings. --- Assistant/Threads/TransferScanner.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant/Threads') diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs index da3f0608f..9b863d306 100644 --- a/Assistant/Threads/TransferScanner.hs +++ b/Assistant/Threads/TransferScanner.hs @@ -124,9 +124,9 @@ expensiveScan rs = unless onlyweb $ do let slocs = S.fromList locs let use a = return $ catMaybes $ map (a key slocs) syncrs if present - then filterM (wantSend (Just f) . Remote.uuid . fst) + then filterM (wantSend True (Just f) . Remote.uuid . fst) =<< use (genTransfer Upload False) - else ifM (wantGet $ Just f) + else ifM (wantGet True $ Just f) ( use (genTransfer Download True) , return [] ) genTransfer :: Direction -> Bool -> Key -> S.Set UUID -> Remote -> Maybe (Remote, Transfer) -- cgit v1.2.3