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

propellor spin

This commit is contained in:
Joey Hess 2014-11-18 17:12:17 -04:00
parent 4f352327be
commit 7fd8150b1f
Failed to extract signature
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Propellor/CmdLine.hs
View File

@ -315,8 +315,10 @@ boot = do
hout <- dup stdOutput hout <- dup stdOutput
hClose stdin hClose stdin
hClose stdout hClose stdout
unlessM (boolSystem "git" [Param "pull", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $ unlessM (boolSystem "git" [Param "fetch", Param "--progress", Param "--upload-pack", Param $ "./propellor --gitpush " ++ show hin ++ " " ++ show hout, Param "."]) $
errorMessage "git pull from client failed" errorMessage "git fetch from client failed"
unlessM (boolSystem "git" [Param "merge", Param "--quiet", Param "FETCH_HEAD"]) $
errorMessage "git merge 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;