From 136de68ca063999d580e5ccd27689b210af9de9b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 16:41:10 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index 93450b42..f973fc08 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -103,8 +103,10 @@ pullFirst cmdline next = do if oldsha == newsha then next else do - void $ boolSystem "make" [Param "build"] - void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] + ifM (boolSystem "make" [Param "build"]) + ( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] + , error "Propellor build failed!" + ) getCurrentGitSha1 :: String -> IO String getCurrentGitSha1 branchref = readProcess "git" ["show-ref", "--hash", branchref] -- cgit v1.2.3