diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-29 13:44:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-29 13:44:53 -0400 |
| commit | 16227a67118b11c2131ee3a3d11ab4633a1cffb5 (patch) | |
| tree | dff6588d79bbc0bc577927bcaa225853a1567d6f /Assistant | |
| parent | a0339f209db365651fab21e99ed4f28024a1bcf0 (diff) | |
avoid using function named that conflicts with name used in newer version of process library
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Drop.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/TransferScanner.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index faff37a23..efd74fdb3 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -14,7 +14,7 @@ import Assistant.Common import Assistant.DaemonStatus import Annex.Drop (handleDropsFrom, Reason) import Logs.Location -import RunCommand +import CmdLine.Action {- Drop from local and/or remote when allowed by the preferred content and - numcopies settings. -} @@ -22,4 +22,4 @@ handleDrops :: Reason -> Bool -> Key -> AssociatedFile -> Maybe Remote -> Assist handleDrops reason fromhere key f knownpresentremote = do syncrs <- syncDataRemotes <$> getDaemonStatus locs <- liftAnnex $ loggedLocations key - liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f knownpresentremote callCommand + liftAnnex $ handleDropsFrom locs syncrs reason fromhere key f knownpresentremote callCommandAction diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs index 6aefb2920..6df9b1e18 100644 --- a/Assistant/Threads/TransferScanner.hs +++ b/Assistant/Threads/TransferScanner.hs @@ -29,7 +29,7 @@ import qualified Git.LsFiles as LsFiles import qualified Backend import Annex.Content import Annex.Wanted -import RunCommand +import CmdLine.Action import qualified Data.Set as S @@ -159,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 callCommand + present key (Just f) Nothing callCommandAction liftAnnex $ do let slocs = S.fromList locs let use a = return $ mapMaybe (a key slocs) syncrs |