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:23:49 -04:00
parent 0f99fb8ab6
commit fb98e0aec4
Failed to extract signature
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Propellor/CmdLine.hs
View File

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