diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-30 17:14:26 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-30 17:14:51 -0400 |
commit | 4318f594d544320825093de8661ed1b40e4774d5 (patch) | |
tree | 709dcd2fe739c503651bc7bd5e1df35a52a27977 /Assistant/Drop.hs | |
parent | 07cd1b2b40735d460c8225762fcf3992b9886c60 (diff) |
finished pushing Assistant monad into all relevant files
All temporary and old functions are removed.
Diffstat (limited to 'Assistant/Drop.hs')
-rw-r--r-- | Assistant/Drop.hs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index 021e40a87..ed9ba577e 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -20,12 +20,13 @@ import Config {- Drop from local and/or remote when allowed by the preferred content and - numcopies settings. -} -handleDrops :: DaemonStatusHandle -> Bool -> Key -> AssociatedFile -> Annex () -handleDrops _ _ _ Nothing = noop -handleDrops dstatus fromhere key f = do - syncrs <- liftIO $ syncRemotes <$> getDaemonStatusOld dstatus - locs <- loggedLocations key - handleDrops' locs syncrs fromhere key f +handleDrops :: Bool -> Key -> AssociatedFile -> Assistant () +handleDrops _ _ Nothing = noop +handleDrops fromhere key f = do + syncrs <- syncRemotes <$> getDaemonStatus + liftAnnex $ do + locs <- loggedLocations key + handleDrops' locs syncrs fromhere key f handleDrops' :: [UUID] -> [Remote] -> Bool -> Key -> AssociatedFile -> Annex () handleDrops' _ _ _ _ Nothing = noop |