From 3f92d3243c0276f20bfd0dd3432f0e4e22e306a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 25 Oct 2013 17:19:23 +0200 Subject: [PATCH] Partially revert Requires Root: changes --- fdroidserver/update.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 77035793..7a0b5d36 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -55,7 +55,7 @@ def update_wiki(apps, apks, verbose=False): wikidata += '{{Disabled|' + app['Disabled'] + '}}\n' if app['AntiFeatures']: wikidata += '{{AntiFeatures|' + app['AntiFeatures'] + '}}\n' - wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|license=%s}}\n'%( + wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|license=%s|root=%s}}\n'%( app['id'], app['Name'], time.strftime('%Y-%m-%d', app['added']) if 'added' in app else '', @@ -67,7 +67,8 @@ def update_wiki(apps, apks, verbose=False): app['FlattrID'], app['Bitcoin'], app['Litecoin'], - app['License']) + app['License'], + app.get('Requires Root', 'No')) wikidata += app['Summary'] wikidata += " - [http://f-droid.org/repository/browse/?fdid=" + app['id'] + " view in repository]\n\n" @@ -550,6 +551,8 @@ def make_index(apps, apks, repodir, archive, categories): if app['AntiFeatures']: addElement('antifeatures', app['AntiFeatures'], doc, apel) + if app['Requires Root']: + addElement('requirements', 'root', doc, apel) # Sort the apk list into version order, just so the web site # doesn't have to do any work by default...