From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 15 Jun 2013 21:02:59 +0000 (+0100)
Subject: Sanitise page names for wiki a bit more
X-Git-Tag: 0.1~534
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=628436e2122f77c8a08ad2fba292ca8dfe703218;p=fdroidserver.git

Sanitise page names for wiki a bit more
---

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 0c27a4e4..ee25daf6 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -148,15 +148,17 @@ def update_wiki(apps, apks, verbose=False):
         # Make a redirect from the name to the ID too, unless there's
         # already an existing page with the name and it isn't a redirect.
         noclobber = False
-        for page in site.allpages(prefix=app['Name'], filterredir='nonredirects'):
-            if page.name == app['Name']:
+        apppagename = app['Name'].replace('_', ' ')
+        apppagename = apppagename.replace('{', '')
+        apppagename = apppagename.replace('}', ' ')
+        for page in site.allpages(prefix=apppagename, filterredir='nonredirects'):
+            if page.name == apppagename:
                 noclobber = True
         # Another reason not to make the redirect page is if the app name
         # is the same as it's ID, because that will overwrite the real page
         # with an redirect to itself! (Although it seems like an odd
         # scenario this happens a lot, e.g. where there is metadata but no
         # builds or binaries to extract a name from.
-        apppagename = app['Name'].replace('_', ' ')
         if apppagename == pagename:
             noclobber = True
         if not noclobber: