This is an automated email from the ASF dual-hosted git repository.
sebb 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 85351219 Doh! revert debug changes
85351219 is described below
commit 853512193c731a7c047bf41a6573f5f59d3aa72a
Author: Sebb <[email protected]>
AuthorDate: Mon Feb 12 16:50:57 2024 +0000
Doh! revert debug changes
---
www/secretary/workbench/views/actions/check-signature.json.rb | 5 ++---
1 file changed, 2 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 37d44568..920652a5 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -101,10 +101,9 @@ def validate_sig(attachment, signature)
tmpfile = File.join(dir, keyid)
KEYSERVERS.each do |server|
begin
- # uri = getServerURI(server, keyid)
+ uri = getServerURI(server, keyid)
# get the public key if possible (throws if not)
- # getURI(uri, tmpfile)
- FileUtils.cp(File.join('/srv/whimsy', keyid), tmpfile) # Temp, don't
bother gpg database
+ getURI(uri, tmpfile)
# import the key for use in validation
out, err, rc = Open3.capture3 gpg,
'--batch', '--import', tmpfile
