summaryrefslogtreecommitdiff
path: root/src/Propellor/CmdLine.hs
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor/CmdLine.hs')
-rw-r--r--src/Propellor/CmdLine.hs10
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;