X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/30380c4b5b28df9670ea5952e14bc485d1d34133..935e6c4b0f4ecb9e55ceac39ebd6f3885a90a218:/wizard/app/mediawiki.py

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index c6ac8ae..7b355af 100644
--- 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
@@ -70,6 +69,8 @@ class Application(app.Application):
             else:
                 raise app.RecoverableInstallFailure(error_messages)
         os.rename('config/LocalSettings.php', 'LocalSettings.php')
+        php.ini_replace_vars()
+
     def upgrade(self, d, version, options):
         if not os.path.isfile("AdminSettings.php"):
             shell.call("git", "checkout", "-q", "mediawiki-" + str(version), "--", "AdminSettings.php")