diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-13 10:06:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-13 10:06:52 -0400 |
| commit | 9e35d6b5641c634e5b5c37bb5fb6213c41029262 (patch) | |
| tree | dba7cd756755d7c7217005552f6be400afdf7b96 /src/Propellor/CmdLine.hs | |
| parent | cc9aa510c97e1838fc9dbc0a1331db1e88954bab (diff) | |
| parent | b6fc95602d4defced34e557db9257ddf68b2bda7 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index 06a5921d..32e97316 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -132,6 +132,8 @@ updateFirst cmdline next = do void $ actionMessage "Git fetch" $ boolSystem "git" [Param "fetch"] + oldsha <- getCurrentGitSha1 branchref + whenM (doesFileExist keyring) $ do {- To verify origin branch commit's signature, have to - convince gpg to use our keyring. While running git log. @@ -153,10 +155,9 @@ updateFirst cmdline next = do then do putStrLn $ "git branch " ++ originbranch ++ " gpg signature verified; merging" hFlush stdout - else errorMessage $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it!" + void $ boolSystem "git" [Param "merge", Param originbranch] + else warningMessage $ "git branch " ++ originbranch ++ " is not signed with a trusted gpg key; refusing to deploy it! (Running with previous configuration instead.)" - oldsha <- getCurrentGitSha1 branchref - void $ boolSystem "git" [Param "merge", Param originbranch] newsha <- getCurrentGitSha1 branchref if oldsha == newsha |