donate-cpu-server.py: Fix rejection of xz packages

This commit is contained in:
versat 2020-01-24 13:31:55 +01:00
parent 2d95c35974
commit 7280dab5b2
1 changed files with 3 additions and 3 deletions

View File

@ -22,7 +22,7 @@ import operator
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
# changes) # changes)
SERVER_VERSION = "1.3.2" SERVER_VERSION = "1.3.3"
OLD_VERSION = '1.90' OLD_VERSION = '1.90'
@ -964,7 +964,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
print('[' + strDateTime() + '] write:' + url) print('[' + strDateTime() + '] write:' + url)
# save data # save data
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.(gz|bz2)', url) res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.(gz|bz2|xz)', url)
if res is None: if res is None:
res = re.match(r'http://cppcheck.sf.net/([a-z]+).tgz', url) res = re.match(r'http://cppcheck.sf.net/([a-z]+).tgz', url)
if res is None: if res is None:
@ -1033,7 +1033,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
print('[' + strDateTime() + '] write_info:' + url) print('[' + strDateTime() + '] write_info:' + url)
# save data # save data
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.(gz|bz2)', url) res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.(gz|bz2|xz)', url)
if res is None: if res is None:
res = re.match(r'http://cppcheck.sf.net/([a-z]+).tgz', url) res = re.match(r'http://cppcheck.sf.net/([a-z]+).tgz', url)
if res is None: if res is None: