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 5de7ad5 run gpg2 if available
5de7ad5 is described below
commit 5de7ad5a5ee2323f0b1a4f61ad8620a28cec9b21
Author: Sam Ruby <[email protected]>
AuthorDate: Mon Oct 23 17:20:40 2017 -0400
run gpg2 if available
---
www/secretary/workbench/views/actions/check-signature.json.rb | 6 +++++-
1 file changed, 5 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 a59e905..920f306 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -11,8 +11,12 @@ begin
attachment = message.find(@attachment).as_file
signature = message.find(@signature).as_file
+ # pick the latest gpg version
+ gpg = `which gpg2`.chomp
+ gpg = `which gpg`.chomp if gpg.empty?
+
# run gpg verify command
- out, err, rc = Open3.capture3 'gpg', '--verify', signature.path,
+ out, err, rc = Open3.capture3 gpg, '--verify', signature.path,
attachment.path
# if key is not found, fetch and try again
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].