aboutsummaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-17 14:30:18 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-17 14:30:18 -0400
commitf3affee1f111886057a5cc3083b55bfafa50bae8 (patch)
tree8b534056de91505376f7a45a0622f58d2e9d3e54 /Remote
parent615053c624b357520ef01db60c58e60d848a44bd (diff)
have onLocal stop any coprocesses, not only cat-file
I have not seen any other coprocesses being started, but let's avoid problems if any do for whatever reason.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Git.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 604056fc2..0a49dd62a 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -54,9 +54,9 @@ import qualified Remote.P2P
import P2P.Address
import Annex.Path
import Creds
-import Annex.CatFile
import Messages.Progress
import Types.NumCopies
+import Annex.Concurrent
import Control.Concurrent
import Control.Concurrent.MSampleVar
@@ -613,7 +613,7 @@ repairRemote r a = return $ do
{- Runs an action from the perspective of a local remote.
-
- The AnnexState is cached for speed and to avoid resource leaks.
- - However, catFileStop is called to avoid git-cat-file processes hanging
+ - However, coprocesses are stopped to avoid git processes hanging
- around on removable media.
-
- The repository's git-annex branch is not updated, as an optimisation.
@@ -637,7 +637,7 @@ onLocal r a = do
go st a' = do
curro <- Annex.getState Annex.output
(ret, st') <- liftIO $ Annex.run (st { Annex.output = curro }) $
- catFileStop `after` a'
+ stopCoProcesses `after` a'
cache st'
return ret