Merge branch 'threaded' into assistant

Command/Fsck.hs

@@ -7,6 +7,8 @@
 
 module Command.Fsck where
 
+import System.Posix.Process (getProcessID)
+
 import Common.Annex
 import Command
 import qualified Annex

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" [] []