summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-12-01 11:53:54 -0400
committerJoey Hess2014-12-01 11:53:54 -0400
commitd84e7a2848be31a08570e683eb20ac2451d14a78 (patch)
treec179d6d0931f3b0ab93256591bd21f871c70e7f7 /src
parentcd8c6114229a5f725bd1818f1fc2d0538c40f486 (diff)
parent1906500030b1f2692d9abe46c2368338d9163894 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Engine.hs6
-rw-r--r--src/Propellor/Property/Docker.hs2
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