Minor doc updates and code refinements.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/TODO b/TODO
index 7cf8c5b80d07419545734e592dc059e91ec2e76f..962ef75903ce8334aa6e872155fec3dcec06b01f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -265,8 +265,11 @@ OVERALL PLAN:
        perform a configuration in the production environment to extract
        out the canonical configuration files.
 
-   12. On the production server, call your wizard to perform an installation.
-       Inspect the generated configuration files, and implement:
+   12. On the production server, call your wizard to perform an installation;
+       be sure to use the option --no-commit in order to make propagating changes
+       back easier.  Inspect the generated configuration files (you can use `git
+       status` to find unversioned files that the installer created), and
+       implement:
             - extractors
             - substitutions
                 These are dictionaries of functions that perform extraction
@@ -298,7 +301,8 @@ OVERALL PLAN:
         script was buggy; try again.
 
     14. The current changes in the working copy should be merged in.  Add any new
-        files, and then `git commit --amend`.
+        files, and then `git commit --amend`.  `git push --force` to stick these
+        changes back in the "public" repository.
 
     15. In your local copy, you can pull the changes by doing `git reset --hard HEAD~`
         and then a `git pull` from the relevant source.  Otherwise, Git will complain

diff --git a/wizard/app/__init__.py b/wizard/app/__init__.py
index 05fe281187c66fe5fde8b2b4af9989407569ff8f..83954396562bf08747a8f0e4813fb43ffb0abbd8 100644 (file)
--- a/wizard/app/__init__.py
+++ b/wizard/app/__init__.py
@@ -244,6 +244,9 @@ class Application(object):
         for use.  Assumes that the current working directory is the deployment.
         Subclasses should provide an implementation.
         """
+        # XXX: Unfortunately, this doesn't quite work because we package
+        # bogus config files in the -scripts versions of installs.  Maybe
+        # we should check a hash or something?
         raise NotImplemented
     @staticmethod
     def make(name):

diff --git a/wizard/app/mediawiki.py b/wizard/app/mediawiki.py
index 8a338c350a7bee6b0447af91b2e46c9aec05efc7..cf9fa01b570d535012bbba1d05aae840c37e7986 100644 (file)
--- a/wizard/app/mediawiki.py
+++ b/wizard/app/mediawiki.py
@@ -29,7 +29,7 @@ class Application(app.Application):
     substitutions.update(php.substitutions)
     install_schema = install.ArgSchema("mysql", "admin", "email", "title")
     def checkConfig(self, deployment):
-        return os.path.isfile(os.path.join(deployment.location, "LocalSettings.php"))
+        return os.path.isfile("LocalSettings.php")
     def detectVersion(self, deployment):
         contents = deployment.read("includes/DefaultSettings.php")
         regex = php.re_var("wgVersion")