summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 16:52:01 -0400
committerJoey Hess2014-11-18 16:52:20 -0400
commit511a728b388860e1efe238a5b3dd12f914db2846 (patch)
tree57dd1a124092a5ee83fdef38bde88912bf88f497 /src/Propellor/CmdLine.hs
parent83431b7b586ad759e843b120086735aaa0e8fc54 (diff)
finally cracked it!
A newline was slipping in and messing up the git protocol.
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs5
1 files changed, 0 insertions, 5 deletions
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