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:40:03 -04:00
parent fc6a75b27d
commit 0cf9c40ba0
Failed to extract signature
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Propellor/CmdLine.hs
View File

@ -96,9 +96,9 @@ pullFirst cmdline next = do
then putStrLn $ "git branch " ++ originbranch ++ " gpg signature verified; merging" then putStrLn $ "git branch " ++ originbranch ++ " gpg signature verified; merging"
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 oldsha <- getCurrentGitSha1 branchref
void $ boolSystem "git" [Param "merge", Param originbranch] void $ boolSystem "git" [Param "merge", Param originbranch]
newsha <- getCurrentGitSha1 newsha <- getCurrentGitSha1 branchref
if oldsha == newsha if oldsha == newsha
then next then next
@ -106,8 +106,8 @@ pullFirst cmdline next = do
void $ boolSystem "make" [Param "build"] void $ boolSystem "make" [Param "build"]
void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)]
getCurrentGitSha1 :: IO String getCurrentGitSha1 :: String -> IO String
getCurrentGitSha1 = readProcess "git" ["show-ref", "--hash", "HEAD"] getCurrentGitSha1 branchref = readProcess "git" ["show-ref", "--hash", branchref]
spin :: HostName -> IO () spin :: HostName -> IO ()
spin host = do spin host = do