[whimsy] branch master updated: check for gpg2's version of the error message

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new c5b82a0  check for gpg2's version of the error message
c5b82a0 is described below

commit c5b82a07a663e7214566a6372d95eb639d40954e
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon Oct 23 18:56:16 2017 -0400

    check for gpg2's version of the error message
---
 www/secretary/workbench/views/actions/check-signature.json.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/actions/check-signature.json.rb b/www/secretary/workbench/views/actions/check-signature.json.rb
index 7e9597e..4635363 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -21,7 +21,10 @@ begin
     attachment.path
 
   # if key is not found, fetch and try again
-  if err.include? "gpg: Can't check signature: public key not found"
+  if 
+    err.include? "gpg: Can't check signature: No public key" or
+    err.include? "gpg: Can't check signature: public key not found"
+  then
     # extract and fetch key
     keyid = err[/[RD]SA key ID (\w+)/,1].untaint
     out2, err2, rc2 = Open3.capture3 gpg, '--keyserver', 'pgpkeys.mit.edu',

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].