From ce859eaa9a329c3dd10869b1f73ee1fdf154bed5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 18 Nov 2014 19:48:02 -0400 Subject: fix long line --- src/Propellor/CmdLine.hs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/Propellor/CmdLine.hs') 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; -- cgit v1.2.3