diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-15 17:25:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-15 17:43:37 -0400 |
| commit | 0b63ee6cd56f57f172695cd25b7c7ec89281ba7e (patch) | |
| tree | 669a76799c46898e9dad846bb245395a234b39b6 /Utility | |
| parent | e1baf48d8853a5015009fe822a125192bb952222 (diff) | |
run git coprocesses with gitEnv
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/CoProcess.hs | 6 | ||||
| -rw-r--r-- | Utility/Process.hs | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Utility/CoProcess.hs b/Utility/CoProcess.hs index 67f861bb3..7a2a5fe8e 100644 --- a/Utility/CoProcess.hs +++ b/Utility/CoProcess.hs @@ -17,9 +17,9 @@ import Common type CoProcessHandle = (ProcessHandle, Handle, Handle, CreateProcess) -start :: FilePath -> [String] -> IO CoProcessHandle -start command params = do - (from, to, _err, pid) <- runInteractiveProcess command params Nothing Nothing +start :: FilePath -> [String] -> Maybe [(String, String)] -> IO CoProcessHandle +start command params env = do + (from, to, _err, pid) <- runInteractiveProcess command params Nothing env return (pid, to, from, proc command params) stop :: CoProcessHandle -> IO () diff --git a/Utility/Process.hs b/Utility/Process.hs index e5de96ae9..1c99b83ca 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -233,5 +233,6 @@ runInteractiveProcess f args c e = do { std_in = CreatePipe , std_out = CreatePipe , std_err = CreatePipe + , env = e } System.Process.runInteractiveProcess f args c e |