diff options
| author | Joey Hess <joey@kitenet.net> | 2014-05-10 11:13:47 -0300 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-10 11:13:47 -0300 |
| commit | eb6e6fe11290971b37a18d9a78f6d9b78228c06f (patch) | |
| tree | 5c7669b6ce12a8e7c95e918e69548de31eb4fba7 /Propellor/Property/Docker.hs | |
| parent | 6088df9105a10ef446cc236982c2e30857182a84 (diff) | |
| parent | d7ad05acaaf05c7af066c1d41f3e70e61a9bec96 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'Propellor/Property/Docker.hs')
| -rw-r--r-- | Propellor/Property/Docker.hs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index e5b8d64a..6757c7cc 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -346,11 +346,18 @@ provisionContainer cid = containerDesc cid $ property "provision" $ liftIO $ do hPutStrLn stderr s hFlush stderr go Nothing rest - Done -> ret lastline - go lastline [] = ret lastline + Done -> do + debug ["reached Done"] + ret lastline + go lastline [] = do + debug ["reached end of output"] + ret lastline - ret lastline = return $ fromMaybe FailedChange $ - readish =<< lastline + ret lastline = do + let v = fromMaybe FailedChange $ + readish =<< lastline + debug ["provisionContainer returning", show v] + return v stopContainer :: ContainerId -> IO Bool stopContainer cid = boolSystem dockercmd [Param "stop", Param $ fromContainerId cid ] |