From 498b8297764da6091362b9d054d5df6e93f8ab29 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Jun 2018 14:58:50 +0300 Subject: [PATCH] Another case where some stderr from children leaked through --- src/Stack/Prelude.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Stack/Prelude.hs b/src/Stack/Prelude.hs index b1753f2f41..6a0dca6a9e 100644 --- a/src/Stack/Prelude.hs +++ b/src/Stack/Prelude.hs @@ -44,7 +44,7 @@ import Data.Conduit.Binary (sourceHandle, sinkHandle) import qualified Data.Conduit.Binary as CB import qualified Data.Conduit.List as CL import Data.Conduit.Process.Typed (withLoggedProcess_, createSource) -import RIO.Process (HasProcessContext (..), ProcessContext, setStdin, closed, getStderr, getStdout, proc, withProcess_, setStdout, setStderr, ProcessConfig, readProcessStdout_, workingDirL) +import RIO.Process (HasProcessContext (..), ProcessContext, setStdin, closed, getStderr, getStdout, proc, withProcess_, setStdout, setStderr, ProcessConfig, readProcess_, workingDirL) import Data.Store as X (Store) import Data.Text.Encoding (decodeUtf8With) import Data.Text.Encoding.Error (lenientDecode) @@ -149,7 +149,7 @@ readProcessNull :: (HasProcessContext env, HasLogFunc env) -> RIO env () readProcessNull name args = -- We want the output to appear in any exceptions, so we capture and drop it - void $ proc name args readProcessStdout_ + void $ proc name args readProcess_ -- | Use the new 'ProcessContext', but retain the working directory -- from the parent environment.