summaryrefslogtreecommitdiff
path: root/Assistant/Threads/TransferScanner.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-01-29 13:44:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-01-29 13:44:53 -0400
commit16227a67118b11c2131ee3a3d11ab4633a1cffb5 (patch)
treedff6588d79bbc0bc577927bcaa225853a1567d6f /Assistant/Threads/TransferScanner.hs
parenta0339f209db365651fab21e99ed4f28024a1bcf0 (diff)
avoid using function named that conflicts with name used in newer version of process library
Diffstat (limited to 'Assistant/Threads/TransferScanner.hs')
-rw-r--r--Assistant/Threads/TransferScanner.hs4
1 files changed, 2 insertions, 2 deletions
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