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

sort repo index data to make index.xml generation reproducible

Browse source 
This makes it easy to test that the code is still generating the exact same
index.xml.  It also might help the ZIP compression work better in index.jar
This commit is contained in:
Hans-Christoph Steiner 2016-11-29 15:55:07 +01:00
parent 56ef716a4e
commit 14f204cfe1
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
fdroidserver/update.py
View file

@ -1028,7 +1028,7 @@ def make_index(apps, sortedids, apks, repodir, archive):
mirrorcheckfailed = False mirrorcheckfailed = False
mirrors = [] mirrors = []
for mirror in config.get('mirrors', []): for mirror in sorted(config.get('mirrors', [])):
base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/')) base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/'))
if config.get('nonstandardwebroot') is not True and base != 'fdroid': if config.get('nonstandardwebroot') is not True and base != 'fdroid':
logging.error("mirror '" + mirror + "' does not end with 'fdroid'!") logging.error("mirror '" + mirror + "' does not end with 'fdroid'!")
@ -1237,28 +1237,29 @@ def make_index(apps, sortedids, apks, repodir, archive):
addElement('sig', apk['sig'], doc, apkel) addElement('sig', apk['sig'], doc, apkel)
old_permissions = set() old_permissions = set()
for perm in apk['uses-permission']: sorted_permissions = sorted(apk['uses-permission'])
for perm in sorted_permissions:
perm_name = perm.name perm_name = perm.name
if perm_name.startswith("android.permission."): if perm_name.startswith("android.permission."):
perm_name = perm_name[19:] perm_name = perm_name[19:]
old_permissions.add(perm_name) old_permissions.add(perm_name)
addElementNonEmpty('permissions', ','.join(old_permissions), doc, apkel) addElementNonEmpty('permissions', ','.join(old_permissions), doc, apkel)
for permission in apk['uses-permission']: for permission in sorted_permissions:
permel = doc.createElement('uses-permission') permel = doc.createElement('uses-permission')
permel.setAttribute('name', permission.name) permel.setAttribute('name', permission.name)
if permission.maxSdkVersion is not None: if permission.maxSdkVersion is not None:
permel.setAttribute('maxSdkVersion', permission.maxSdkVersion) permel.setAttribute('maxSdkVersion', permission.maxSdkVersion)
apkel.appendChild(permel) apkel.appendChild(permel)
for permission_sdk_23 in apk['uses-permission-sdk-23']: for permission_sdk_23 in sorted(apk['uses-permission-sdk-23']):
permel = doc.createElement('uses-permission-sdk-23') permel = doc.createElement('uses-permission-sdk-23')
permel.setAttribute('name', permission_sdk_23.name) permel.setAttribute('name', permission_sdk_23.name)
if permission_sdk_23.maxSdkVersion is not None: if permission_sdk_23.maxSdkVersion is not None:
permel.setAttribute('maxSdkVersion', permission_sdk_23.maxSdkVersion) permel.setAttribute('maxSdkVersion', permission_sdk_23.maxSdkVersion)
apkel.appendChild(permel) apkel.appendChild(permel)
if 'nativecode' in apk: if 'nativecode' in apk:
addElement('nativecode', ','.join(apk['nativecode']), doc, apkel) addElement('nativecode', ','.join(sorted(apk['nativecode'])), doc, apkel)
addElementNonEmpty('features', ','.join(apk['features']), doc, apkel) addElementNonEmpty('features', ','.join(sorted(apk['features'])), doc, apkel)
if current_version_file is not None \ if current_version_file is not None \
and config['make_current_version_link'] \ and config['make_current_version_link'] \
@ -1331,7 +1332,7 @@ def make_index(apps, sortedids, apks, repodir, archive):
def make_categories_txt(repodir, categories): def make_categories_txt(repodir, categories):
'''Write a category list in the repo to allow quick access''' '''Write a category list in the repo to allow quick access'''
catdata = '' catdata = ''
for cat in categories: for cat in sorted(categories):
catdata += cat + '\n' catdata += cat + '\n'
with open(os.path.join(repodir, 'categories.txt'), 'w', encoding='utf8') as f: with open(os.path.join(repodir, 'categories.txt'), 'w', encoding='utf8') as f:
f.write(catdata) f.write(catdata)