diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-18 18:47:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-18 18:47:44 -0400 |
| commit | 34cbe738b7e1fc38fa26eeb0cc9f203f5f429fae (patch) | |
| tree | 2c2c6899893a4eba6ba6d226f6e3fb1411bbe049 /src/Propellor/CmdLine.hs | |
| parent | 80a20d6df36e789a452474fb6d1329583ebe95b2 (diff) | |
don't need to parse --gitpush; just use a Continue
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index ebe790ec..8220cbe2 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -54,7 +54,6 @@ processCmdLine = go =<< getArgs go ("--chain":h:[]) = return $ Chain h False go ("--chain":h:b:[]) = return $ Chain h (Prelude.read b) go ("--docker":h:[]) = return $ Docker h - go ("--gitpush":fin:fout:_) = return $ GitPush (Prelude.read fin) (Prelude.read fout) go (h:[]) | "--" `isPrefixOf` h = usage | otherwise = return $ Run h @@ -310,7 +309,7 @@ boot = do hout <- dup stdOutput hClose stdin 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" -- Shim for git push over the propellor ssh channel. |