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

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

View file

@ -31,7 +31,7 @@ seek ps = ifM isDirect
startIndirect :: FilePath -> CommandStart
startIndirect file = next $ do
unlessM (callCommand $ Command.Add.start file) $
unlessM (callCommandAction $ Command.Add.start file) $
error $ "failed to add " ++ file ++ "; canceling commit"
next $ return True

View file

@ -513,7 +513,7 @@ syncFile rs f (k, _) = do
-- Using callCommand rather than commandAction for drops,
-- because a failure to drop does not mean the sync failed.
handleDropsFrom (putrs ++ locs) rs "unwanted" True k (Just f)
Nothing callCommand
Nothing callCommandAction
where
wantget have = allM id
[ pure (not $ null have)

View file

@ -107,7 +107,7 @@ startNoRepo _ = do
(d:_) -> do
setCurrentDirectory d
state <- Annex.new =<< Git.CurrentRepo.get
void $ Annex.eval state $ callCommand $
void $ Annex.eval state $ callCommandAction $
start' False listenhost
{- Run the webapp without a repository, which prompts the user, makes one,