From 511a728b388860e1efe238a5b3dd12f914db2846 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 16:52:01 -0400 Subject: finally cracked it! A newline was slipping in and messing up the git protocol. --- src/Propellor/CmdLine.hs | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/Propellor/CmdLine.hs') diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 0711064d..1345a298 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -216,15 +216,11 @@ spin hn hst = do loop Just NeedGitPush -> do sendMarked toh gitPushMarker "" - void $ hGetLine fromh let p = (proc "git" ["upload-pack", "."]) { std_in = UseHandle fromh , std_out = UseHandle toh } (Nothing, Nothing, Nothing, h) <- createProcess p - {-forever $ do - b <- B.hGetSome fromh 40960 - hPutStrLn stderr $ show ("<<<", b)-} unlessM ((==) ExitSuccess <$> waitForProcess h) $ errorMessage "git upload-pack failed" -- no more protocol possible after @@ -330,7 +326,6 @@ gitPush hin hout = void $ fromstdin `concurrently` tostdout hSetBinaryMode fromh True hSetBinaryMode toh True b <- B.hGetSome fromh 40960 - hPutStrLn stderr $ show ("from", fromh, "to", toh, b) if B.null b then do hClose fromh -- cgit v1.3-2-g0d8e