[whimsy] branch master updated: Longer keyid format for retry

[se...@apache.org]

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 7520439  Longer keyid format for retry
7520439 is described below

commit 7520439092b9350996d21672212a071a42476b13
Author: Sebb <se...@apache.org>
AuthorDate: Mon Apr 29 22:17:35 2019 +0100

    Longer keyid format for retry
---
 www/secretary/workbench/views/actions/check-signature.json.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/secretary/workbench/views/actions/check-signature.json.rb b/www/secretary/workbench/views/actions/check-signature.json.rb
index 20fb9fe..26f4dba 100644
--- a/www/secretary/workbench/views/actions/check-signature.json.rb
+++ b/www/secretary/workbench/views/actions/check-signature.json.rb
@@ -49,8 +49,11 @@ begin
     end
   
     # run gpg verify command again
-    out, err, rc = Open3.capture3 gpg, '--verify', signature.path,
-      attachment.path
+    # TODO: may need to drop the keyid-format parameter when gpg is updated as it might
+    # reduce the keyid length from the full fingerprint
+    out, err, rc = Open3.capture3 gpg, 
+      '--keyid-format', 'long', # Show a longer id
+      '--verify', signature.path, attachment.path
 
     # if verify failed, concatenate fetch output
     if rc.exitstatus != 0