[whimsy] branch master updated: two more places where we should be using gpg2

[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 5a6e90f  two more places where we should be using gpg2
5a6e90f is described below

commit 5a6e90fe698a026ce6814559c6996b5d7b62f754
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon Oct 23 18:48:05 2017 -0400

    two more places where we should be using gpg2
---
 www/secretary/workbench/views/actions/check-signature.json.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/secretary/workbench/views/actions/check-signature.json.rb b/www/secretary/workbench/views/actions/check-signature.json.rb
index 52179ec..7e9597e 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -14,20 +14,21 @@ begin
   # pick the latest gpg version
   gpg = `which gpg2`.chomp
   gpg = `which gpg`.chomp if gpg.empty?
+  gpg.untaint
 
   # run gpg verify command
-  out, err, rc = Open3.capture3 gpg.untaint, '--verify', signature.path,
+  out, err, rc = Open3.capture3 gpg, '--verify', signature.path,
     attachment.path
 
   # if key is not found, fetch and try again
   if err.include? "gpg: Can't check signature: public key not found"
     # extract and fetch key
     keyid = err[/[RD]SA key ID (\w+)/,1].untaint
-    out2, err2, rc2 = Open3.capture3 'gpg', '--keyserver', 'pgpkeys.mit.edu',
+    out2, err2, rc2 = Open3.capture3 gpg, '--keyserver', 'pgpkeys.mit.edu',
       '--recv-keys', keyid
 
     # run gpg verify command again
-    out, err, rc = Open3.capture3 'gpg', '--verify', signature.path,
+    out, err, rc = Open3.capture3 gpg, '--verify', signature.path,
       attachment.path
 
     # if verify failed, concatenate fetch output

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