diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-31 16:24:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-31 16:24:48 -0400 |
| commit | 78b05d22ff1d452ee690a9aaf97c8f67a70c4f73 (patch) | |
| tree | 5c81f9251b5cdd2e328c4805cc6a9a8986c27165 /Propellor | |
| parent | fb98e0aec4110d81d5f59ca7168f76a1253fd706 (diff) | |
propellor spin
Diffstat (limited to 'Propellor')
| -rw-r--r-- | Propellor/CmdLine.hs | 5 |
1 files 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] |