Fix build with process 1.2.1.0.
This commit is contained in:
parent
8172f243d7
commit
01d8ab0cfd
|
@ -6,6 +6,7 @@ propellor (1.2.3) UNRELEASED; urgency=medium
|
|||
that docker exec doesn't enter a chroot.
|
||||
* Update intermediary propellor in --spin --via
|
||||
* Added support for DNSSEC.
|
||||
* Fix build with process 1.2.1.0.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ module Utility.Process (
|
|||
) where
|
||||
|
||||
import qualified System.Process
|
||||
import System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
|
||||
import qualified System.Process as X hiding (CreateProcess(..), createProcess, runInteractiveProcess, readProcess, readProcessWithExitCode, system, rawSystem, runInteractiveCommand, runProcess)
|
||||
import System.Process hiding (createProcess, readProcess)
|
||||
import System.Exit
|
||||
import System.IO
|
||||
|
@ -47,7 +47,7 @@ import Control.Concurrent
|
|||
import qualified Control.Exception as E
|
||||
import Control.Monad
|
||||
#ifndef mingw32_HOST_OS
|
||||
import System.Posix.IO
|
||||
import qualified System.Posix.IO
|
||||
#else
|
||||
import Control.Applicative
|
||||
#endif
|
||||
|
@ -175,9 +175,9 @@ processTranscript' cmd opts environ input = do
|
|||
#ifndef mingw32_HOST_OS
|
||||
{- This implementation interleves stdout and stderr in exactly the order
|
||||
- the process writes them. -}
|
||||
(readf, writef) <- createPipe
|
||||
readh <- fdToHandle readf
|
||||
writeh <- fdToHandle writef
|
||||
(readf, writef) <- System.Posix.IO.createPipe
|
||||
readh <- System.Posix.IO.fdToHandle readf
|
||||
writeh <- System.Posix.IO.fdToHandle writef
|
||||
p@(_, _, _, pid) <- createProcess $
|
||||
(proc cmd opts)
|
||||
{ std_in = if isJust input then CreatePipe else Inherit
|
||||
|
|
Loading…
Reference in New Issue