summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 16:41:10 -0400
committerJoey Hess2014-03-31 16:41:10 -0400
commit136de68ca063999d580e5ccd27689b210af9de9b (patch)
tree6ce585dbd14488e4d9f1fef077521a93407a6870 /Propellor
parent025a07124d43399e85eed80ca663beee0a93dda0 (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs6
1 files 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]