cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build with process 1.2.1.0.

This commit is contained in:
Joey Hess 2015-01-04 12:52:03 -04:00
parent 8172f243d7
commit 01d8ab0cfd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -6,6 +6,7 @@ propellor (1.2.3) UNRELEASED; urgency=medium
that docker exec doesn't enter a chroot. that docker exec doesn't enter a chroot.
* Update intermediary propellor in --spin --via * Update intermediary propellor in --spin --via
* Added support for DNSSEC. * 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 -- Joey Hess <id@joeyh.name> Thu, 01 Jan 2015 13:27:23 -0400

10
src/Utility/Process.hs
View File

@ -38,7 +38,7 @@ module Utility.Process (
) where ) where
import qualified System.Process 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.Process hiding (createProcess, readProcess)
import System.Exit import System.Exit
import System.IO import System.IO
@ -47,7 +47,7 @@ import Control.Concurrent
import qualified Control.Exception as E import qualified Control.Exception as E
import Control.Monad import Control.Monad
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import System.Posix.IO import qualified System.Posix.IO
#else #else
import Control.Applicative import Control.Applicative
#endif #endif
@ -175,9 +175,9 @@ processTranscript' cmd opts environ input = do
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
{- This implementation interleves stdout and stderr in exactly the order {- This implementation interleves stdout and stderr in exactly the order
- the process writes them. -} - the process writes them. -}
(readf, writef) <- createPipe (readf, writef) <- System.Posix.IO.createPipe
readh <- fdToHandle readf readh <- System.Posix.IO.fdToHandle readf
writeh <- fdToHandle writef writeh <- System.Posix.IO.fdToHandle writef
p@(_, _, _, pid) <- createProcess $ p@(_, _, _, pid) <- createProcess $
(proc cmd opts) (proc cmd opts)
{ std_in = if isJust input then CreatePipe else Inherit { std_in = if isJust input then CreatePipe else Inherit