diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-20 13:31:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-20 13:31:03 -0400 |
| commit | e3154828f5f44071536c19044ea14240efd9880c (patch) | |
| tree | d765f4aff353f14c04658aff3d3e384eab1e1224 /Assistant | |
| parent | f03dab3b7c7a0d377d00d65ed4b8af935e97571d (diff) | |
much better command action handling for sync --content
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Drop.hs | 3 | ||||
| -rw-r--r-- | Assistant/Threads/TransferScanner.hs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index 03ab5ab2c..3020b0f4f 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -14,6 +14,7 @@ import Assistant.Common import Assistant.DaemonStatus import Annex.Drop (handleDropsFrom, Reason) import Logs.Location +import RunCommand {- Drop from local and/or remote when allowed by the preferred content and - numcopies settings. -} @@ -22,4 +23,4 @@ handleDrops _ _ _ Nothing _ = noop handleDrops reason fromhere key f knownpresentremote = do syncrs <- syncDataRemotes <$> getDaemonStatus locs <- liftAnnex $ loggedLocations key - liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f knownpresentremote + liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f knownpresentremote callCommand diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs index b00195789..60f6dc28b 100644 --- a/Assistant/Threads/TransferScanner.hs +++ b/Assistant/Threads/TransferScanner.hs @@ -29,6 +29,7 @@ import qualified Git.LsFiles as LsFiles import qualified Backend import Annex.Content import Annex.Wanted +import RunCommand import qualified Data.Set as S @@ -158,7 +159,7 @@ expensiveScan urlrenderer rs = unless onlyweb $ batch <~> do present <- liftAnnex $ inAnnex key liftAnnex $ handleDropsFrom locs syncrs "expensive scan found too many copies of object" - present key (Just f) Nothing + present key (Just f) Nothing callCommand liftAnnex $ do let slocs = S.fromList locs let use a = return $ mapMaybe (a key slocs) syncrs |