[whimsy] branch master updated: Allow for betaN version suffix

[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 a5021e6  Allow for betaN version suffix
a5021e6 is described below

commit a5021e6977923f0a396133f87430e4fedf6e6d21
Author: Sebb <s...@apache.org>
AuthorDate: Sat Feb 13 10:29:02 2021 +0000

    Allow for betaN version suffix
---
 tools/download_check.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/download_check.rb b/tools/download_check.rb
index e62f73f..c2bf846 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -454,7 +454,7 @@ def _checkDownloadPage(path, tlp, version)
                 if ver =~ %r{^(\d+(?:\.\d+)+)(-.+)$}
                   ver1 = $1 # save result
                   ver2 = $2
-                  if %w(-bin -src).include? $2 or $2 =~ %r{^-bin-} # allow for 
-bin-scala...
+                  if %w(-bin -src).include? $2 or $2 =~ %r{^-(bin|beta\d)-} # 
allow for -bin-scala...
                     ver = ver1
                     pfx = pfx + ver2
                   end
@@ -720,12 +720,6 @@ if __FILE__ == $0
   testentries(:E).each { |t| t.map{|k, v| puts "#{k}: - #{v}"}}
   testentries(:F).each { |t| t.map{|k, v| puts "#{k}: - #{v}"}}
   puts ""
-  if @fails > 0
-    puts "NAK: #{url} had #{@fails} errors"
-  else
-    puts "OK: #{url} passed all the tests"
-  end
-  puts ""
 
   # Only show in CLI version for now
   puts "Version summary"
@@ -736,4 +730,12 @@ if __FILE__ == $0
       end
   end
   puts ""
+
+  if @fails > 0
+    puts "NAK: #{url} had #{@fails} errors"
+  else
+    puts "OK: #{url} passed all the tests"
+  end
+  puts ""
+
 end