mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid using function named that conflicts with name used in newer version of process library

Browse source
This commit is contained in:
Joey Hess 2014-01-29 13:44:53 -04:00
parent 36e08e4491
commit cce69eee4d
10 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/TransferScanner.hs
View file

@ -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