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/Drop.hs
View file

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