cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-03-31 16:42:25 -04:00
parent 136de68ca0
commit afe622f4a1
Failed to extract signature
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Propellor/CmdLine.hs
View File

@ -93,7 +93,9 @@ pullFirst cmdline next = do
nukeFile $ privDataDir </> "trustring.gpg" nukeFile $ privDataDir </> "trustring.gpg"
nukeFile $ privDataDir </> "gpg.conf" nukeFile $ privDataDir </> "gpg.conf"
if s == "U\n" || s == "G\n" 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!" else error $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!"
oldsha <- getCurrentGitSha1 branchref oldsha <- getCurrentGitSha1 branchref
@ -103,6 +105,7 @@ pullFirst cmdline next = do
if oldsha == newsha if oldsha == newsha
then next then next
else do else do
putStrLn "Rebuilding propeller.."
ifM (boolSystem "make" [Param "build"]) ifM (boolSystem "make" [Param "build"])
( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] ( void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)]
, error "Propellor build failed!" , error "Propellor build failed!"