1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-08 00:10:12 +01:00

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

This commit is contained in:
David Black 2012-09-22 18:52:44 +01:00
commit 41d7b78777

View File

@ -102,12 +102,14 @@ def update_wiki(apps, apks, verbose=False):
if len(app['Current Version']) > 0: if len(app['Current Version']) > 0:
wikidata += "The current (recommended) version is " + app['Current Version'] wikidata += "The current (recommended) version is " + app['Current Version']
wikidata += " (version code " + app['Current Version Code'] + ").\n\n" wikidata += " (version code " + app['Current Version Code'] + ").\n\n"
validapks = 0
for apk in apklist: for apk in apklist:
wikidata += "==" + apk['version'] + "==\n" wikidata += "==" + apk['version'] + "==\n"
if 'buildproblem' in apk: if 'buildproblem' in apk:
wikidata += "We can't build this version: " + apk['buildproblem'] + "\n\n" wikidata += "We can't build this version: " + apk['buildproblem'] + "\n\n"
else: else:
validapks += 1
wikidata += "This version is built and signed by " wikidata += "This version is built and signed by "
if apk.has_key('srcname'): if apk.has_key('srcname'):
wikidata += "F-Droid, and guaranteed to correspond to the source tarball published with it.\n\n" wikidata += "F-Droid, and guaranteed to correspond to the source tarball published with it.\n\n"
@ -116,7 +118,7 @@ def update_wiki(apps, apks, verbose=False):
wikidata += "Version code: " + str(apk['versioncode']) + '\n' wikidata += "Version code: " + str(apk['versioncode']) + '\n'
wikidata += '\n[[Category:' + wikicat + ']]\n' wikidata += '\n[[Category:' + wikicat + ']]\n'
if len(apklist) == 0 and not app['Disabled']: if validapks == 0 and not app['Disabled']:
wikidata += '\n[[Category:Apps with no packages]]\n' wikidata += '\n[[Category:Apps with no packages]]\n'
elif cantupdate and not app['Disabled']: elif cantupdate and not app['Disabled']:
wikidata += "\n[[Category:Apps we can't update]]\n" wikidata += "\n[[Category:Apps we can't update]]\n"