diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-09 18:03:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-09 18:03:00 -0400 |
| commit | 2512faa6301603cfbda9706acb6b3670d3311e7f (patch) | |
| tree | 2c07df8981953fb2dcf81abc0694648a34b44c87 /Assistant/Drop.hs | |
| parent | b65e678e7b557520be4b63eb0e91d88682e1dd42 (diff) | |
| parent | bef58852d9b6150b0e2a47c412bd12dcc34a7794 (diff) | |
Merge branch 'dropproof'
Diffstat (limited to 'Assistant/Drop.hs')
| -rw-r--r-- | Assistant/Drop.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index 57eef8f3a..5653b7795 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -15,11 +15,12 @@ import Assistant.DaemonStatus import Annex.Drop (handleDropsFrom, Reason) import Logs.Location import CmdLine.Action +import Types.NumCopies {- Drop from local and/or remote when allowed by the preferred content and - numcopies settings. -} -handleDrops :: Reason -> Bool -> Key -> AssociatedFile -> Maybe Remote -> Assistant () -handleDrops reason fromhere key f knownpresentremote = do +handleDrops :: Reason -> Bool -> Key -> AssociatedFile -> [VerifiedCopy] -> Assistant () +handleDrops reason fromhere key f preverified = do syncrs <- syncDataRemotes <$> getDaemonStatus locs <- liftAnnex $ loggedLocations key - liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f knownpresentremote callCommandAction + liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f preverified callCommandAction |