walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Donate CPU: Also use and accept .tar.bz2 package files. (#1707) 

In my tests there were about 1500 additional packages
available as bz2 on the server.
For some packages a newer version is now used if it is
only available as .tar.bz2 archive.
The donate-cpu.py client is tested to work with .tar.bz2
files under Python 2.7.15 and 3.6.8.
This commit is contained in:
Sebastian 2019-02-28 08:40:07 +01:00 committed by amai2012
parent 98bf112352
commit 4e90922e5b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/daca2-getpackages.py
View File

@ -88,7 +88,7 @@ def getpackages():
filename = None
elif line.startswith('./pool/main/'):
path = line[2:-1]
elif path and line.endswith('.orig.tar.gz'):
elif path and line.endswith(('.orig.tar.gz', '.orig.tar.bz2')):
filename = line[1 + line.rfind(' '):]
return archives

4
tools/donate-cpu-server.py
View File

@ -743,7 +743,7 @@ def server(server_address_port, packages, packageIndex, resultPath):
print('[' + strDateTime() + '] write:' + url)
# save data
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.gz', url)
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.(gz|bz2)', url)
if res is None:
print('results not written. res is None.')
continue
@ -809,7 +809,7 @@ def server(server_address_port, packages, packageIndex, resultPath):
print('[' + strDateTime() + '] write_info:' + url)
# save data
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.gz', url)
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.(gz|bz2)', url)
if res is None:
print('info output not written. res is None.')
continue