Check for old style URLs.

[wizard.git] / wizard / app / mediawiki.py

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index a527b3b491d2f2dca49601d3e05b0d23aaff95f7..7b355afbf9562caea28493cabd450cabbdb4fa3a 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -10,6 +10,7 @@ from wizard import app, install, resolve, shell, util
 from wizard.app import php
 
 def make_filename_regex(var):
+    """See :ref:`versioning config <seed>` for more information."""
     return 'LocalSettings.php', php.re_var(var)
 
 seed = util.dictmap(make_filename_regex, {
@@ -38,9 +39,7 @@ class Application(app.Application):
     def detectVersion(self, deployment):
         return self.detectVersionFromFile("includes/DefaultSettings.php", php.re_var("wgVersion"))
     def checkWeb(self, deployment):
-        return self.checkWebPage(deployment, "/index.php?title=Main_Page", "<!-- Served")
-    def prepareMerge(self, deployment):
-        resolve.fix_newlines("LocalSettings.php")
+        return self.checkWebPage(deployment, "/index.php?title=Main_Page", outputs=["<!-- Served"])
     def install(self, version, options):
         util.soft_unlink("LocalSettings.php")
         os.chmod("config", 0777) # XXX: vaguely sketchy