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.

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index efd16fc9a78eb1eed960468544c8a172a54e8c3f..0036d81e2a92de11c068948745a6afc09dbe2252 100644 (file)
--- 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 3d5e3ad6ddf1a504609f668d35191a5337d9a567..106ed1bbc65b1ebb0f6bece8db9bd3c6cfdab78e 100644 (file)
--- 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: