Fix bug in scripts MySQL database generation.

[wizard.git] / wizard / install / __init__.py

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():