From 9dfae00bd3949e4e23d4c24c7aa7375fdff4c9fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 15:15:56 -0400 Subject: propellor spin --- src/Propellor/Protocol.hs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Protocol.hs') diff --git a/src/Propellor/Protocol.hs b/src/Propellor/Protocol.hs index 6394fc71..bdea7d10 100644 --- a/src/Propellor/Protocol.hs +++ b/src/Propellor/Protocol.hs @@ -28,7 +28,7 @@ gitPushMarker :: String gitPushMarker = "GITPUSH" toMarked :: Marker -> String -> String -toMarked marker = ++ +toMarked = (++) fromMarked :: Marker -> Marked -> Maybe String fromMarked marker s @@ -47,11 +47,13 @@ getMarked :: Handle -> Marker -> IO (Maybe String) 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 - Just v -> return (Just v) + go (Just l) = do + hPutStrLn stderr $ show ("got ", l) + case fromMarked marker l of + Nothing -> do + putStrLn l + getMarked h marker + Just v -> return (Just v) req :: Stage -> Marker -> (String -> IO ()) -> IO () req stage marker a = do -- cgit v1.2.3