Fix bug in scripts MySQL database generation.

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

diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py
index 123f35507c4119807de83c36eb0b3c280fca60be..fc83818d5dc85db72f71bd2af106127b5c60fc79 100644 (file)
--- a/wizard/app/wordpress.py
+++ b/wizard/app/wordpress.py
@@ -1,5 +1,6 @@
 import os
 import re
+import logging
 
 from wizard import app, install, resolve, sql, util
 from wizard.app import php
@@ -62,8 +63,10 @@ class Application(app.Application):
                 }
         old_mode = os.stat(".").st_mode
         os.chmod(".", 0777) # XXX: squick squick
-        install.fetch(options, "wp-admin/setup-config.php?step=2", post_setup_config)
+        result = install.fetch(options, "wp-admin/setup-config.php?step=2", post_setup_config)
+        logging.debug("setup-config.php output\n\n" + result)
         result = install.fetch(options, "wp-admin/install.php?step=2", post_install)
+        logging.debug("install.php output\n\n" + result)
         os.chmod(".", old_mode)
         if "Finished" not in result:
             raise install.Failure()

diff --git a/wizard/install/__init__.py b/wizard/install/__init__.py
index b22849a190dc6ece92ca46dbb237ec91d7f0483b..bce756b1b60c7f17c17af7758f9f6b72d74e0fca 100644 (file)
--- a/wizard/install/__init__.py
+++ b/wizard/install/__init__.py
@@ -127,6 +127,8 @@ class ScriptsMysqlStrategy(Strategy):
     """
     side_effects = True
     provides = frozenset(["mysql_host", "mysql_user", "mysql_password", "mysql_db"])
+    def __init__(self, dir):
+        self.dir = dir
     def prepare(self):
         """Uses :func:`wizard.scripts.get_sql_credentials`"""
         self._triplet = scripts.get_sql_credentials()
@@ -138,10 +140,9 @@ class ScriptsMysqlStrategy(Strategy):
     def execute(self, options):
         """Creates a new database for the user using ``get-next-database`` and ``create-database``."""
         sh = shell.Shell()
-        name = os.path.basename(os.getcwd())
         options.mysql_host, options.mysql_user, options.mysql_password = self._triplet
         # race condition
-        options.mysql_db = self._username + '+' + sh.eval("/mit/scripts/sql/bin/get-next-database", name)
+        options.mysql_db = self._username + '+' + sh.eval("/mit/scripts/sql/bin/get-next-database", os.path.basename(self.dir))
         sh.call("/mit/scripts/sql/bin/create-database", options.mysql_db)
 
 class ScriptsEmailStrategy(Strategy):
@@ -285,7 +286,7 @@ class ArgSchema(object):
         raw_strategies = [
                 EnvironmentStrategy(self),
                 ScriptsWebStrategy(dir),
-                ScriptsMysqlStrategy(),
+                ScriptsMysqlStrategy(dir),
                 ScriptsEmailStrategy(),
                 ]
         for arg in self.args.values():