avoid using function named that conflicts with name used in newer version of process library
This commit is contained in:
parent
36e08e4491
commit
cce69eee4d
10 changed files with 19 additions and 17 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue