Merge branch 'archive_icons' into 'master'

update: populate app level info for archive only from archived apks

Closes #365

See merge request fdroid/fdroidserver!537
This commit is contained in:
Hans-Christoph Steiner 2018-07-27 13:09:13 +00:00
commit 481a6274f0

View file

@ -29,6 +29,7 @@ import zipfile
import hashlib import hashlib
import pickle import pickle
import time import time
import copy
from datetime import datetime from datetime import datetime
from argparse import ArgumentParser from argparse import ArgumentParser
@ -2029,7 +2030,9 @@ def main():
# If there's an archive repo, make the index for it. We already scanned it # If there's an archive repo, make the index for it. We already scanned it
# earlier on. # earlier on.
if len(repodirs) > 1: if len(repodirs) > 1:
index.make(apps, sortedids, archapks, repodirs[1], True) archived_apps = copy.deepcopy(apps)
apply_info_from_latest_apk(archived_apps, archapks)
index.make(archived_apps, sortedids, archapks, repodirs[1], True)
git_remote = config.get('binary_transparency_remote') git_remote = config.get('binary_transparency_remote')
if git_remote or os.path.isdir(os.path.join('binary_transparency', '.git')): if git_remote or os.path.isdir(os.path.join('binary_transparency', '.git')):