From db2d46246c5772c12aa8cf64ea604b65d164a7b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Apr 2016 01:59:38 -0400 Subject: make sure that the wrapper runs propellor in the foreground --- src/wrapper.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wrapper.hs b/src/wrapper.hs index 212f737d..90f14379 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -14,6 +14,7 @@ import Propellor.Message import Propellor.Bootstrap import Utility.Monad import Utility.Process +import Utility.Process.NonConcurrent import System.Directory import System.Environment (getArgs) @@ -39,5 +40,5 @@ buildRunConfig args = do buildPropellor Nothing putStrLn "" putStrLn "" - (_, _, _, pid) <- createProcess (proc "./propellor" args) - exitWith =<< waitForProcess pid + (_, _, _, pid) <- createProcessNonConcurrent (proc "./propellor" args) + exitWith =<< waitForProcessNonConcurrent pid -- cgit v1.2.3