kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-16 03:10:09 +02:00
Code Activity

Merge branch 'patch-1' into 'master'

Browse Source 
makebuildserver: show number of files to download

See merge request fdroid/fdroidserver!647
This commit is contained in:
Michael Pöhn 2019-05-28 08:48:07 +00:00
commit 92f50e5e50
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makebuildserver
View File

@ -413,13 +413,14 @@ def run_via_vagrant_ssh(v, cmdlist):
def update_cache(cachedir):
count_files = 0
for srcurl, shasum in CACHE_FILES:
filename = os.path.basename(srcurl)
local_filename = os.path.join(cachedir, filename)
count_files = count_files + 1
if os.path.exists(local_filename):
if sha256_for_file(local_filename) == shasum:
logging.info("\t...shasum verified for %s", local_filename)
logging.info("\t...shasum verified for '{filename}'\t({filecounter} of {filesum} files)".format(filename=local_filename, filecounter=count_files, filesum=len(CACHE_FILES)))
continue
local_length = os.path.getsize(local_filename)
else:
@ -462,7 +463,7 @@ def update_cache(cachedir):
v = sha256_for_file(local_filename)
if v == shasum:
logging.info("\t...shasum verified for %s", local_filename)
logging.info("\t...shasum verified for '{filename}'\t({filecounter} of {filesum} files)".format(filename=local_filename, filecounter=count_files, filesum=len(CACHE_FILES)))
else:
logging.critical("Invalid shasum of '%s' detected for %s", v, local_filename)
os.remove(local_filename)