diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-29 13:44:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-29 13:44:53 -0400 |
| commit | 16227a67118b11c2131ee3a3d11ab4633a1cffb5 (patch) | |
| tree | dff6588d79bbc0bc577927bcaa225853a1567d6f /Command | |
| parent | a0339f209db365651fab21e99ed4f28024a1bcf0 (diff) | |
avoid using function named that conflicts with name used in newer version of process library
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/PreCommit.hs | 2 | ||||
| -rw-r--r-- | Command/Sync.hs | 2 | ||||
| -rw-r--r-- | Command/WebApp.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs index 6644f6ffa..388d065c0 100644 --- a/Command/PreCommit.hs +++ b/Command/PreCommit.hs @@ -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 diff --git a/Command/Sync.hs b/Command/Sync.hs index 6ef111bc4..acd487df3 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -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) diff --git a/Command/WebApp.hs b/Command/WebApp.hs index 9a2d4a38f..d5f43432c 100644 --- a/Command/WebApp.hs +++ b/Command/WebApp.hs @@ -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, |