cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debug

This commit is contained in:
Joey Hess 2014-11-18 16:28:27 -04:00
parent 935e1d11fe
commit 257f9f6bb2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Propellor/CmdLine.hs
View File

@ -222,7 +222,7 @@ spin hn hst = do
} }
(Nothing, Nothing, Nothing, h) <- createProcess p (Nothing, Nothing, Nothing, h) <- createProcess p
unlessM ((==) ExitSuccess <$> waitForProcess h) $ unlessM ((==) ExitSuccess <$> waitForProcess h) $
warningMessage "git upload-pack failed" errorMessage "git upload-pack failed"
-- no more protocol possible after -- no more protocol possible after
-- git push -- git push
Just NeedGitClone -> do Just NeedGitClone -> do
@ -308,7 +308,7 @@ boot = do
hClose stdin hClose stdin
hClose stdout hClose stdout
unlessM (boolSystem "git" [Param "pull", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ 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. -- Shim for git push over the propellor ssh channel.
-- Reads from stdin and sends it to hout; -- Reads from stdin and sends it to hout;
@ -324,6 +324,7 @@ gitPush hin hout = void $ fromstdin `concurrently` tostdout
connect h stdout connect h stdout
connect fromh toh = do connect fromh toh = do
b <- B.hGetSome fromh 40960 b <- B.hGetSome fromh 40960
hPutStrLn stderr $ show ("from", fromh, "to", toh, b)
unless (B.null b) $ do unless (B.null b) $ do
B.hPut toh b B.hPut toh b
hFlush toh hFlush toh