From 78b05d22ff1d452ee690a9aaf97c8f67a70c4f73 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 31 Mar 2014 16:24:48 -0400 Subject: propellor spin --- Propellor/CmdLine.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs index 094de659..4188e8f8 100644 --- a/Propellor/CmdLine.hs +++ b/Propellor/CmdLine.hs @@ -84,8 +84,9 @@ pullFirst next = do (Just [("GNUPGHOME", privDataDir)]) nukeFile $ privDataDir "trustring.gpg" nukeFile $ privDataDir "gpg.conf" - when (s /= "U\n" && s/= "G\n") $ - error $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!" + if s /= "U\n" && s/= "G\n" + then error $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!" + else putStrLn "git branch " ++ originbranch ++ " gpg signature verified; merging" void $ boolSystem "git" [Param "merge", Param originbranch] -- cgit v1.2.3