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

fix display of progress etc lines before protocol line

This commit is contained in:
Joey Hess 2014-11-18 17:57:04 -04:00
parent fff8d91a04
commit 75a824c788
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Propellor/Protocol.hs
View File

@ -1,7 +1,7 @@
-- | This is a simple line-based protocol used for communication between -- | This is a simple line-based protocol used for communication between
-- a local and remote propellor. It's sent over a ssh channel, and lines of -- a local and remote propellor. It's sent over a ssh channel, and lines of
-- the protocol can be interspersed with other, non-protocol lines -- the protocol can be interspersed with other, non-protocol lines
-- that should be ignored. -- that should be passed through to be displayed.
module Propellor.Protocol where module Propellor.Protocol where
@ -48,7 +48,9 @@ getMarked h marker = go =<< catchMaybeIO (hGetLine h)
where where
go Nothing = return Nothing go Nothing = return Nothing
go (Just l) = case fromMarked marker l of go (Just l) = case fromMarked marker l of
Nothing -> getMarked h marker Nothing -> do
hPutStrLn stderr l
getMarked h marker
Just v -> return (Just v) Just v -> return (Just v)
req :: Stage -> Marker -> (String -> IO ()) -> IO () req :: Stage -> Marker -> (String -> IO ()) -> IO ()