mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

merge from propellor

Browse source
This commit is contained in:
Joey Hess 2015-10-28 00:18:01 -04:00
parent ef5496b8de
commit 8b09e9306a
Failed to extract signature
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Utility/Process.hs
View file

@ -41,9 +41,12 @@ module Utility.Process (
devNull, devNull,
) where ) where
import qualified System.Process import qualified Utility.Process.Shim
import qualified System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess) import qualified Utility.Process.Shim as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
import System.Process hiding (createProcess, readProcess, waitForProcess) import Utility.Process.Shim hiding (createProcess, readProcess, waitForProcess)
import Utility.Misc
import Utility.Exception
import System.Exit import System.Exit
import System.IO import System.IO
import System.Log.Logger import System.Log.Logger
@ -58,9 +61,6 @@ import Control.Applicative
import Data.Maybe import Data.Maybe
import Prelude import Prelude
import Utility.Misc
import Utility.Exception
type CreateProcessRunner = forall a. CreateProcess -> ((Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO a) -> IO a type CreateProcessRunner = forall a. CreateProcess -> ((Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO a) -> IO a
data StdHandle = StdinHandle | StdoutHandle | StderrHandle data StdHandle = StdinHandle | StdoutHandle | StderrHandle
@ -372,7 +372,7 @@ startInteractiveProcess cmd args environ = do
createProcess :: CreateProcess -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) createProcess :: CreateProcess -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
createProcess p = do createProcess p = do
debugProcess p debugProcess p
System.Process.createProcess p Utility.Process.Shim.createProcess p
-- | Debugging trace for a CreateProcess. -- | Debugging trace for a CreateProcess.
debugProcess :: CreateProcess -> IO () debugProcess :: CreateProcess -> IO ()
@ -392,6 +392,6 @@ debugProcess p = debugM "Utility.Process" $ unwords
-- | Wrapper around 'System.Process.waitForProcess' that does debug logging. -- | Wrapper around 'System.Process.waitForProcess' that does debug logging.
waitForProcess :: ProcessHandle -> IO ExitCode waitForProcess :: ProcessHandle -> IO ExitCode
waitForProcess h = do waitForProcess h = do
r <- System.Process.waitForProcess h r <- Utility.Process.Shim.waitForProcess h
debugM "Utility.Process" ("process done " ++ show r) debugM "Utility.Process" ("process done " ++ show r)
return r return r

3
Utility/Process/Shim.hs Normal file
View file

@ -0,0 +1,3 @@
module Utility.Process.Shim (module X) where
import System.Process as X