summaryrefslogtreecommitdiff
path: root/Command/Map.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-18 15:30:26 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-18 18:00:24 -0400
commitd1da9cf221aeea5c7ac8a313a18b559791a04f12 (patch)
treefe8d7e42efb89441d14ab8d5d71bb8f0f007330b /Command/Map.hs
parentfc5652c811a9a644bb8964b3b8c13df24f2ec7c7 (diff)
switch from System.Cmd.Utils to System.Process
Test suite now passes with -threaded! I traced back all the hangs with -threaded to System.Cmd.Utils. It seems it's just crappy/unsafe/outdated, and should not be used. System.Process seems to be the cool new thing, so converted all the code to use it instead. In the process, --debug stopped printing commands it runs. I may try to bring that back later. Note that even SafeSystem was switched to use System.Process. Since that was a modified version of code from System.Cmd.Utils, it needed to be converted too. I also got rid of nearly all calls to forkProcess, and all calls to executeFile, which I'm also doubtful about working well with -threaded.
Diffstat (limited to 'Command/Map.hs')
-rw-r--r--Command/Map.hs11
1 files changed, 8 insertions, 3 deletions
diff --git a/Command/Map.hs b/Command/Map.hs
index 0773f6828..f69b88a5d 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -9,6 +9,7 @@ module Command.Map where
import Control.Exception.Extensible
import qualified Data.Map as M
+import System.Process
import Common.Annex
import Command
@@ -198,9 +199,13 @@ tryScan r
case result of
Left _ -> return Nothing
Right r' -> return $ Just r'
- pipedconfig cmd params = safely $
- pOpen ReadFromPipe cmd (toCommand params) $
- Git.Config.hRead r
+ pipedconfig cmd params = safely $ do
+ (_, Just h, _, pid) <-
+ createProcess (proc cmd $ toCommand params)
+ { std_out = CreatePipe }
+ r' <- Git.Config.hRead r h
+ forceSuccessProcess pid cmd $ toCommand params
+ return r'
configlist =
onRemote r (pipedconfig, Nothing) "configlist" [] []