From 257f9f6bb229c61a99899125ac81906125094f6a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 16:28:27 -0400 Subject: debug --- src/Propellor/CmdLine.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 7b20574a..293bf3a2 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -222,7 +222,7 @@ spin hn hst = do } (Nothing, Nothing, Nothing, h) <- createProcess p unlessM ((==) ExitSuccess <$> waitForProcess h) $ - warningMessage "git upload-pack failed" + errorMessage "git upload-pack failed" -- no more protocol possible after -- git push Just NeedGitClone -> do @@ -308,7 +308,7 @@ boot = do hClose stdin hClose stdout unlessM (boolSystem "git" [Param "pull", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ - warningMessage "git pull from client failed" + errorMessage "git pull from client failed" -- Shim for git push over the propellor ssh channel. -- Reads from stdin and sends it to hout; @@ -324,6 +324,7 @@ gitPush hin hout = void $ fromstdin `concurrently` tostdout connect h stdout connect fromh toh = do b <- B.hGetSome fromh 40960 + hPutStrLn stderr $ show ("from", fromh, "to", toh, b) unless (B.null b) $ do B.hPut toh b hFlush toh -- cgit v1.2.3