From 3afd6ca684f8c5394c628de059352a824fbe8e37 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 25 Nov 2016 15:29:37 +0100 Subject: [PATCH] only set 'No description available' in the old index format The new index format aims to be a direct representation of the data, then the clients/website will handle the rest. --- fdroidserver/metadata.py | 3 --- fdroidserver/update.py | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index efd16fc9..0036d81e 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -831,9 +831,6 @@ def post_metadata_parse(app): build[k] = str(v) builds.append(build) - if not app.get('Description'): - app['Description'] = 'No description available' - app.builds = sorted_builds(builds) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 3d5e3ad6..106ed1bb 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -1159,8 +1159,12 @@ def make_index(apps, sortedids, apks, repodir, archive): return ("fdroid.app:" + appid, apps[appid].Name) raise MetaDataException("Cannot resolve app id " + appid) + if app.get('Description'): + description = app.Description + else: + description = 'No description available' addElement('desc', - metadata.description_html(app.Description, linkres), + metadata.description_html(description, linkres), doc, apel) addElement('license', app.License, doc, apel) if app.Categories: -- 2.30.2