diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-31 16:42:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-31 16:42:25 -0400 |
| commit | afe622f4a1eb598185649048cd5e00191765333a (patch) | |
| tree | cc24cdb12e57d4ad0c1a448910c4cff196c3af05 | |
| parent | 136de68ca063999d580e5ccd27689b210af9de9b (diff) | |
propellor spin
| -rw-r--r-- | Propellor/CmdLine.hs | 5 |
1 files changed, 4 insertions, 1 deletions
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!" |