(whimsy) branch master updated: Don't rely on import message

[sebb]

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 fcd0a9e2 Don't rely on import message
fcd0a9e2 is described below

commit fcd0a9e26868439b30921122860f783a069a3320
Author: Sebb <s...@apache.org>
AuthorDate: Sun Aug 25 20:22:23 2024 +0100

    Don't rely on import message
---
 www/secretary/workbench/views/actions/check-signature.json.rb | 2 +-
 1 file changed, 1 insertion(+), 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 a0c14bff..59b6755a 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -105,7 +105,7 @@ def validate_sig(attachment, signature, msgid)
             '--batch', '--import', tmpfile
           # For later analysis
           Wunderbar.warn "#{gpg} --import #{tmpfile} rc=#{rc} out=#{out} 
err=#{err}"
-          if err.include? 'imported: 1' # downloaded key is valid; store it 
for posterity
+          if err.include? 'gpg: Signature made' # downloaded key is valid; 
store it for posterity TODO: better check
             Dir.mktmpdir do |tmpdir|
               container = ASF::SVN.svnpath!('iclas', '__keys__')
               ASF::SVN.svn!('checkout',[container, tmpdir], {depth: 'empty', 
env: env})