From 0cf9c40ba0df83d3cac37afa07c3ad4ea78987f9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 16:40:03 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Propellor/CmdLine.hs') diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index ed00f51a..93450b42 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -96,9 +96,9 @@ pullFirst cmdline next = do 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!" - oldsha <- getCurrentGitSha1 + oldsha <- getCurrentGitSha1 branchref void $ boolSystem "git" [Param "merge", Param originbranch] - newsha <- getCurrentGitSha1 + newsha <- getCurrentGitSha1 branchref if oldsha == newsha then next @@ -106,8 +106,8 @@ pullFirst cmdline next = do void $ boolSystem "make" [Param "build"] void $ boolSystem "./propellor" [Param "--continue", Param (show cmdline)] -getCurrentGitSha1 :: IO String -getCurrentGitSha1 = readProcess "git" ["show-ref", "--hash", "HEAD"] +getCurrentGitSha1 :: String -> IO String +getCurrentGitSha1 branchref = readProcess "git" ["show-ref", "--hash", branchref] spin :: HostName -> IO () spin host = do -- cgit v1.2.3