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

don't need to parse --gitpush; just use a Continue

This commit is contained in:
Joey Hess 2014-11-18 18:47:44 -04:00
parent 80a20d6df3
commit 34cbe738b7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Propellor/CmdLine.hs
View File

@ -54,7 +54,6 @@ processCmdLine = go =<< getArgs
go ("--chain":h:[]) = return $ Chain h False go ("--chain":h:[]) = return $ Chain h False
go ("--chain":h:b:[]) = return $ Chain h (Prelude.read b) go ("--chain":h:b:[]) = return $ Chain h (Prelude.read b)
go ("--docker":h:[]) = return $ Docker h go ("--docker":h:[]) = return $ Docker h
go ("--gitpush":fin:fout:_) = return $ GitPush (Prelude.read fin) (Prelude.read fout)
go (h:[]) go (h:[])
| "--" `isPrefixOf` h = usage | "--" `isPrefixOf` h = usage
| otherwise = return $ Run h | otherwise = return $ Run h
@ -310,7 +309,7 @@ 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 "pull", Param "--progress", Param "--upload-pack", Param $ "./propellor --continue " ++ show (GitPush hin hout), Param "."]) $
errorMessage "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.