From 4c4da3d176f7674b66d3e82b7c5d9f7dd7c03a3e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 18 Sep 2018 09:42:06 +0200 Subject: [PATCH] update: remove 'SET' debug antifeature, closes #565 oops, this slipped in in 3011953d0ef6d4b58aad6b272ff9fa2527530040 Bump the metadata version to purge the cache --- fdroidserver/update.py | 4 ++-- tests/repo/index-v1.json | 4 ++-- tests/repo/index.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index a4807f43..8798f7c9 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -49,7 +49,7 @@ from PIL import Image, PngImagePlugin warnings.simplefilter('error', Image.DecompressionBombWarning) Image.MAX_IMAGE_PIXELS = 0xffffff # 4096x4096 -METADATA_VERSION = 20 +METADATA_VERSION = 21 # less than the valid range of versionCode, i.e. Java's Integer.MIN_VALUE UNSET_VERSION_CODE = -0x100000000 @@ -488,7 +488,7 @@ def write_cache(apkcache): class Encoder(json.JSONEncoder): def default(self, obj): if isinstance(obj, set): - return ['SET'] + list(obj) + return list(obj) elif isinstance(obj, datetime): return obj.timestamp() return super().default(obj) diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json index 89d5d718..90c6f0c6 100644 --- a/tests/repo/index-v1.json +++ b/tests/repo/index-v1.json @@ -1,7 +1,7 @@ { "repo": { "timestamp": 1502845383782, - "version": 20, + "version": 21, "name": "My First F-Droid Repo Demo", "icon": "fdroid-icon.png", "address": "https://MyFirstFDroidRepo.org/fdroid/repo", @@ -602,4 +602,4 @@ } ] } -} \ No newline at end of file +} diff --git a/tests/repo/index.xml b/tests/repo/index.xml index 52e80ab1..69c6cd89 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -1,6 +1,6 @@ - + This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. http://foobarfoobarfoobar.onion/fdroid/repo https://foo.bar/fdroid/repo