mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

added some docstrings and error messages

Browse source
This commit is contained in:
Michael Pöhn 2017-09-20 00:58:19 +02:00
parent 6fc968f7cd
commit 75c5fa6355
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/index.py
View file

@ -242,6 +242,13 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints):
"""Sorts the supplied list to ensure a deterministic sort order for
package entries in the index file. This sort-order also expresses
installation preference to the clients.
(First in this list = first to install)
:param packages: list of packages which need to be sorted before but into index file.
"""
GROUP_DEV_SIGNED = 1
GROUP_FDROID_SIGNED = 2
@ -270,7 +277,7 @@ def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints):
packages.sort(key=v1_sort_keys)
def make_v0(apps, apks, repodir, repodict, requestsdict):
def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fingerprints):
"""
aka index.jar aka index.xml
"""
@ -354,8 +361,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict):
root.appendChild(element)
element.setAttribute('packageName', packageName)
fdroid_signed = load_sigkeys(repodir)
for appid, appdict in apps.items():
app = metadata.App(appdict)
@ -369,7 +374,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict):
if apk.get('versionCode') and apk.get('packageName') == appid:
apksbyversion[apk['versionCode']].append(apk)
for versionCode, apksforver in apksbyversion.items():
fdroidsig = fdroid_signed.get(appid, {}).get('signer')
fdroidsig = fdroid_signing_key_fingerprints.get(appid, {}).get('signer')
fdroid_signed_apk = None
name_match_apk = None
for x in apksforver: