From 92fda5711286a5eee9123e1577d751bd64b417d3 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 27 Nov 2013 10:39:36 +0000 Subject: [PATCH] Don't push UpstreamNonFree to index (yet) --- fdroidserver/update.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index c240b405..ed9476c8 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -570,7 +570,14 @@ def make_index(apps, apks, repodir, archive, categories): addElement('marketvercode', app['Current Version Code'], doc, apel) if app['AntiFeatures']: - addElement('antifeatures', app['AntiFeatures'], doc, apel) + af = app['AntiFeatures'].split(',') + # TODO: Temporarily not including UpstreamNonFree in the index, + # because current F-Droid clients do not understand it, and also + # look ugly when they encounter an unknown antifeature. This + # filtering can be removed in time... + if 'UpstreamNonFree' in af: + af.remove('UpstreamNonFree') + addElement('antifeatures', ','.join(af), doc, apel) if app['Requires Root']: addElement('requirements', 'root', doc, apel)