From afe622f4a1eb598185649048cd5e00191765333a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 16:42:25 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Propellor') diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index f973fc08..fd5daed4 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -93,7 +93,9 @@ pullFirst cmdline next = do nukeFile $ privDataDir "trustring.gpg" nukeFile $ privDataDir "gpg.conf" if s == "U\n" || s == "G\n" - then putStrLn $ "git branch " ++ originbranch ++ " gpg signature verified; merging" + then do + putStrLn $ "git branch " ++ originbranch ++ " gpg signature verified; merging" + hFlush stdout else error $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!" oldsha <- getCurrentGitSha1 branchref @@ -103,6 +105,7 @@ pullFirst cmdline next = do if oldsha == newsha then next else do + putStrLn "Rebuilding propeller.." ifM (boolSystem "make" [Param "build"]) ( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] , error "Propellor build failed!" -- cgit v1.2.3