From 16227a67118b11c2131ee3a3d11ab4633a1cffb5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 29 Jan 2014 13:44:53 -0400
Subject: avoid using function named that conflicts with name used in newer
 version of process library

---
 Assistant/Threads/TransferScanner.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Assistant/Threads')

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
-- 
cgit v1.2.3