[whimsy] branch master updated: gpg --verify implies verification is mentioned

[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 e828af2  gpg --verify implies verification is mentioned
e828af2 is described below

commit e828af27f1df5ba7aa5f53c430602605dd736c72
Author: Sebb <s...@apache.org>
AuthorDate: Thu Dec 3 12:09:40 2020 +0000

    gpg --verify implies verification is mentioned
---
 tools/download_check.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tools/download_check.rb b/tools/download_check.rb
index 3f9ceba..da21962 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -403,21 +403,25 @@ def _checkDownloadPage(path, tlp, version)
     end
   end
 
+  hasGPGverify = false
+  # Check if GPG verify has two parameters
+  body.scan(%r{^.+gpg --verify.+$}){|m|
+    hasGPGverify = true
+    unless m =~ %r{gpg --verify\s+\S+\.asc\s+\S+}
+      W "gpg verify should specify second param: #{m.strip} 
see:\nhttps://www.apache.org/info/verification.html#specify_both";
+    end
+  }
+
   # check for verify instructions
   bodytext = body.gsub(/\s+/,' ') # single line
   if VERIFY_TEXT.any? {|text| bodytext.include? text}
     I 'Found reference to download verification'
+  elsif hasGPGverify
+    W 'Found reference to GPG verify; assuming this is part of download 
verification statement'
   else
     E 'Could not find statement of the need to verify downloads'
   end
 
-  # Check if GPG verify has two parameters
-  body.scan(%r{^.+gpg --verify.+$}){|m|
-    unless m =~ %r{gpg --verify\s+\S+\.asc\s+\S+}
-      W "gpg verify should specify second param: #{m.strip} 
see:\nhttps://www.apache.org/info/verification.html#specify_both";
-    end
-  }
-
   # check if page refers to md5sum
   body.scan(%r{^.+md5sum.+$}){|m|
     W "Found md5sum: #{m.strip}"