summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 16:55:20 -0400
committerJoey Hess2014-11-18 16:55:20 -0400
commitfc657d62cb78b536a515ea35e5f294f453592d5c (patch)
tree586bcc791f7dbff32b46d0d608cdba933325e75f /src
parent511a728b388860e1efe238a5b3dd12f914db2846 (diff)
action message
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/CmdLine.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 1345a298..0d7fdd48 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -214,17 +214,19 @@ spin hn hst = do
Just NeedPrivData -> do
sendprivdata toh privdata
loop
- Just NeedGitPush -> do
+ Just NeedGitPush -> void $ actionMessage "Git update" $ do
sendMarked toh gitPushMarker ""
let p = (proc "git" ["upload-pack", "."])
{ std_in = UseHandle fromh
, std_out = UseHandle toh
}
(Nothing, Nothing, Nothing, h) <- createProcess p
- unlessM ((==) ExitSuccess <$> waitForProcess h) $
- errorMessage "git upload-pack failed"
+ r <- waitForProcess h
-- no more protocol possible after
-- git push
+ hClose fromh
+ hClose toh
+ return (r == ExitSuccess)
Just NeedGitClone -> do
hClose toh
hClose fromh