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 d79440f Add exceptions for OO
d79440f is described below
commit d79440f3db442908cd06bf44c4421dd083ad718b
Author: Sebb <[email protected]>
AuthorDate: Tue May 4 14:43:09 2021 +0100
Add exceptions for OO
---
tools/download_check.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/download_check.rb b/tools/download_check.rb
index d5cf562..f955771 100755
--- a/tools/download_check.rb
+++ b/tools/download_check.rb
@@ -242,6 +242,7 @@ end
# returns www|archive, stem and the hash extension
def check_hash_loc(h,tlp)
tlpQE = Regexp.escape(tlp) # in case of meta-chars
+ tlpQE = "(?:ooo|#{tlpQE})" if tlp == 'openoffice'
if h =~
%r{^(https?)://(?:(archive|www)\.)?apache\.org/dist/(?:incubator/)?#{tlpQE}/.*?([^/]+)\.(\w{3,6})$}
WE "HTTPS! #{h}" unless $1 == 'https'
return $2,$3,$4
@@ -499,7 +500,8 @@ def _checkDownloadPage(path, tlp, version)
unless $vercheck[base].first == 'archive'
stem = base[0..-(ext.size+2)]
# version must include '.', e.g. xxx-m.n.oyyy
- if stem =~ %r{^.+?-(\d+(?:\.\d+)+)(.*)$}
+# Apache_OpenOffice-SDK_4.1.10_Linux_x86-64_install-deb_en-US
+ if stem =~ %r{^.+?[-_](\d+(?:\.\d+)+)(.*)$}
# $1 = version
# $2 any suffix, e.g. -bin, -src (or other)
ver = $1 # main version
