summaryrefslogtreecommitdiff
path: root/Propellor/CmdLine.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 19:31:35 -0400
committerJoey Hess2014-03-31 19:31:35 -0400
commitd53729495efe7174239deab3b5dd71204543b0d0 (patch)
tree522e11f8d5362ea373d13ed8029368a4b1cd83c2 /Propellor/CmdLine.hs
parenta020b66fcb2c10e81409f5ebc7b3bdb40dbaef45 (diff)
propellor spin
Diffstat (limited to 'Propellor/CmdLine.hs')
-rw-r--r--Propellor/CmdLine.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index c3576b94..325f8d68 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -73,7 +73,7 @@ unknownhost h = errorMessage $ unwords
buildFirst :: CmdLine -> IO () -> IO ()
buildFirst cmdline next = do
oldtime <- getmtime
- ifM (actionMessage "Rebuilding propellor" $ boolSystem "make" [Param "build"])
+ ifM (actionMessage "Propellor build" $ boolSystem "make" [Param "build"])
( do
newtime <- getmtime
if newtime == oldtime
@@ -90,7 +90,7 @@ updateFirst cmdline next = do
<$> readProcess "git" ["symbolic-ref", "HEAD"]
let originbranch = "origin" </> takeFileName branchref
- void $ actionMessage "Fetching" $ boolSystem "git" [Param "fetch"]
+ void $ actionMessage "Git fetch" $ boolSystem "git" [Param "fetch"]
whenM (doesFileExist keyring) $ do
{- To verify origin/master commit's signature, have to
@@ -120,7 +120,7 @@ updateFirst cmdline next = do
if oldsha == newsha
then next
- else ifM (actionMessage "Rebuilding propellor" $ boolSystem "make" [Param "build"])
+ else ifM (actionMessage "Propellor build" $ boolSystem "make" [Param "build"])
( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)]
, errorMessage "Propellor build failed!"
)