aboutsummaryrefslogtreecommitdiff
path: root/Assistant/Drop.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/Drop.hs
parenta0339f209db365651fab21e99ed4f28024a1bcf0 (diff)
avoid using function named that conflicts with name used in newer version of process library
Diffstat (limited to 'Assistant/Drop.hs')
-rw-r--r--Assistant/Drop.hs4
1 files changed, 2 insertions, 2 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