diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-18 16:52:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-18 16:52:20 -0400 |
| commit | 511a728b388860e1efe238a5b3dd12f914db2846 (patch) | |
| tree | 57dd1a124092a5ee83fdef38bde88912bf88f497 /src/Propellor/Protocol.hs | |
| parent | 83431b7b586ad759e843b120086735aaa0e8fc54 (diff) | |
finally cracked it!
A newline was slipping in and messing up the git protocol.
Diffstat (limited to 'src/Propellor/Protocol.hs')
| -rw-r--r-- | src/Propellor/Protocol.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Propellor/Protocol.hs b/src/Propellor/Protocol.hs index 7bbf472d..99afb31f 100644 --- a/src/Propellor/Protocol.hs +++ b/src/Propellor/Protocol.hs @@ -1,7 +1,7 @@ -- | 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 -- the protocol can be interspersed with other, non-protocol lines --- that should just be passed through to be displayed. +-- that should be ignored. module Propellor.Protocol where @@ -48,9 +48,7 @@ getMarked h marker = go =<< catchMaybeIO (hGetLine h) where go Nothing = return Nothing go (Just l) = case fromMarked marker l of - Nothing -> do - putStrLn l - getMarked h marker + Nothing -> getMarked h marker Just v -> return (Just v) req :: Stage -> Marker -> (String -> IO ()) -> IO () |
