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:24:48 -04:00
parent fb98e0aec4
commit 78b05d22ff
Failed to extract signature
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Propellor/CmdLine.hs
View File

@ -84,8 +84,9 @@ pullFirst next = do
(Just [("GNUPGHOME", privDataDir)]) (Just [("GNUPGHOME", privDataDir)])
nukeFile $ privDataDir </> "trustring.gpg" nukeFile $ privDataDir </> "trustring.gpg"
nukeFile $ privDataDir </> "gpg.conf" nukeFile $ privDataDir </> "gpg.conf"
when (s /= "U\n" && s/= "G\n") $ if s /= "U\n" && s/= "G\n"
error $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!" 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] void $ boolSystem "git" [Param "merge", Param originbranch]