diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-18 19:48:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-18 19:48:02 -0400 |
| commit | ce859eaa9a329c3dd10869b1f73ee1fdf154bed5 (patch) | |
| tree | 4daf2b5c68f06847e6ef1d0ef868c4e9af15eff5 /src/Propellor/CmdLine.hs | |
| parent | 8b6531ea43e43bd979ad9b8125fc21c6602dea38 (diff) | |
fix long line
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index c85906d9..cd491c6f 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -281,8 +281,16 @@ update = do hout <- dup stdOutput hClose stdin hClose stdout - unlessM (boolSystem "git" [Param "pull", Param "--progress", Param "--upload-pack", Param $ "./propellor --continue " ++ show (GitPush hin hout), Param "."]) $ + unlessM (boolSystem "git" (pullparams hin hout)) $ errorMessage "git pull from client failed" + where + pullparams hin hout = + [ Param "pull" + , Param "--progress" + , Param "--upload-pack" + , Param $ "./propellor --continue " ++ show (GitPush hin hout) + , Param "." + ] -- Shim for git push over the propellor ssh channel. -- Reads from stdin and sends it to hout; |
