diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Engine.hs | 6 | ||||
| -rw-r--r-- | src/Propellor/Property/Docker.hs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Propellor/Engine.hs b/src/Propellor/Engine.hs index 0b65fb7e..81cc2397 100644 --- a/src/Propellor/Engine.hs +++ b/src/Propellor/Engine.hs @@ -77,12 +77,16 @@ processChainOutput h = go Nothing where go lastline = do v <- catchMaybeIO (hGetLine h) + debug ["read from chained propellor: ", show v] case v of Nothing -> case lastline of - Nothing -> pure FailedChange + Nothing -> do + debug ["chained propellor output nothing; assuming it failed"] + return FailedChange Just l -> case readish l of Just r -> pure r Nothing -> do + debug ["chained propellor output did not end with a Result; assuming it failed"] putStrLn l hFlush stdout return FailedChange diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 586ebc2e..5fa06517 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -430,7 +430,7 @@ provisionContainer cid = containerDesc cid $ property "provisioned" $ liftIO $ d let params = ["--continue", show $ toChain cid] msgh <- mkMessageHandle let p = inContainerProcess cid - [ if isConsole msgh then "-it" else "-i" ] + (if isConsole msgh then ["-it"] else []) (shim : params) r <- withHandle StdoutHandle createProcessSuccess p $ processChainOutput |